summaryrefslogtreecommitdiffstats
path: root/gst/law
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-07-06 20:49:52 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-07-06 20:49:52 +0000
commit292fec2a0bd1f221a46ad69c5100995d04c01057 (patch)
tree658db299e0e03b2454ff840730569d79539e67c4 /gst/law
parenta8183e9a3fa87cf4247c7df16207f440ea4069c0 (diff)
New mimetypes gone into effect today - this commit changes all old mimetypes over to the new mimetypes spec as descri...
Original commit message from CVS: New mimetypes gone into effect today - this commit changes all old mimetypes over to the new mimetypes spec as described in the previous commit's document. Note: some plugins will break, some pipelines will break, expect HEAD to be broken or at least not 100% working for a few days, but don't forget to report bugs
Diffstat (limited to 'gst/law')
-rw-r--r--gst/law/alaw-decode.c4
-rw-r--r--gst/law/alaw-encode.c4
-rw-r--r--gst/law/alaw.c25
-rw-r--r--gst/law/mulaw-decode.c4
-rw-r--r--gst/law/mulaw-encode.c4
-rw-r--r--gst/law/mulaw.c26
6 files changed, 28 insertions, 39 deletions
diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c
index 8236fa08..94cf6d05 100644
--- a/gst/law/alaw-decode.c
+++ b/gst/law/alaw-decode.c
@@ -86,9 +86,7 @@ alawdec_link (GstPad *pad, GstCaps *caps)
tempcaps = GST_CAPS_NEW (
"alawdec_src_caps",
- "audio/raw",
- "format", GST_PROPS_STRING ("int"),
- "law", GST_PROPS_INT (0),
+ "audio/x-raw-int",
"depth", GST_PROPS_INT (16),
"width", GST_PROPS_INT (16),
"signed", GST_PROPS_BOOLEAN (TRUE),
diff --git a/gst/law/alaw-encode.c b/gst/law/alaw-encode.c
index cff93c51..cd796886 100644
--- a/gst/law/alaw-encode.c
+++ b/gst/law/alaw-encode.c
@@ -126,9 +126,7 @@ alawenc_link (GstPad *pad, GstCaps *caps)
tempcaps = GST_CAPS_NEW (
"alawenc_src_caps",
- "audio/raw",
- "format", GST_PROPS_STRING ("int"),
- "law", GST_PROPS_INT (2),
+ "audio/x-alaw",
"depth", GST_PROPS_INT (8),
"width", GST_PROPS_INT (8),
"signed", GST_PROPS_BOOLEAN (FALSE),
diff --git a/gst/law/alaw.c b/gst/law/alaw.c
index 1e0c5b8b..02479281 100644
--- a/gst/law/alaw.c
+++ b/gst/law/alaw.c
@@ -32,14 +32,11 @@ alaw_factory (void)
return
gst_caps_new (
"test_src",
- "audio/raw",
+ "audio/x-alaw",
gst_props_new (
- "format", GST_PROPS_STRING ("int"),
- "law", GST_PROPS_INT (2),
- "width", GST_PROPS_INT(8),
- "depth", GST_PROPS_INT(8),
- "signed", GST_PROPS_BOOLEAN(FALSE),
- NULL));
+ "rate", GST_PROPS_INT_RANGE (8000, 192000),
+ "channels", GST_PROPS_INT_RANGE (1, 2),
+ NULL));
}
static GstCaps*
@@ -48,14 +45,14 @@ linear_factory (void)
return
gst_caps_new (
"test_sink",
- "audio/raw",
+ "audio/x-raw-int",
gst_props_new (
- "format", GST_PROPS_STRING ("int"),
- "law", GST_PROPS_INT(0),
- "width", GST_PROPS_INT(16),
- "depth", GST_PROPS_INT(16),
- "endianness", GST_PROPS_INT(G_BYTE_ORDER),
- "signed", GST_PROPS_BOOLEAN(TRUE),
+ "width", GST_PROPS_INT(16),
+ "depth", GST_PROPS_INT(16),
+ "endianness", GST_PROPS_INT(G_BYTE_ORDER),
+ "signed", GST_PROPS_BOOLEAN(TRUE),
+ "rate", GST_PROPS_INT_RANGE (8000, 192000),
+ "channels", GST_PROPS_INT_RANGE (1, 2),
NULL));
}
diff --git a/gst/law/mulaw-decode.c b/gst/law/mulaw-decode.c
index a7728665..abce597d 100644
--- a/gst/law/mulaw-decode.c
+++ b/gst/law/mulaw-decode.c
@@ -65,9 +65,7 @@ mulawdec_link (GstPad *pad, GstCaps *caps)
tempcaps = GST_CAPS_NEW (
"sinesrc_src_caps",
- "audio/raw",
- "format", GST_PROPS_STRING ("int"),
- "law", GST_PROPS_INT (0),
+ "audio/x-raw-int",
"depth", GST_PROPS_INT (16),
"width", GST_PROPS_INT (16),
"signed", GST_PROPS_BOOLEAN (TRUE),
diff --git a/gst/law/mulaw-encode.c b/gst/law/mulaw-encode.c
index d1eb8497..ec045db6 100644
--- a/gst/law/mulaw-encode.c
+++ b/gst/law/mulaw-encode.c
@@ -64,9 +64,7 @@ mulawenc_link (GstPad *pad, GstCaps *caps)
tempcaps = GST_CAPS_NEW (
"sinesrc_src_caps",
- "audio/raw",
- "format", GST_PROPS_STRING ("int"),
- "law", GST_PROPS_INT (1),
+ "audio/x-mulaw",
"depth", GST_PROPS_INT (8),
"width", GST_PROPS_INT (8),
"signed", GST_PROPS_BOOLEAN (FALSE),
diff --git a/gst/law/mulaw.c b/gst/law/mulaw.c
index d0c8bbdb..2b6bf7ab 100644
--- a/gst/law/mulaw.c
+++ b/gst/law/mulaw.c
@@ -32,13 +32,13 @@ mulaw_factory (void)
return
gst_caps_new (
"test_src",
- "audio/raw",
+ "audio/x-mulaw",
gst_props_new (
- "format", GST_PROPS_STRING ("int"),
- "law", GST_PROPS_INT (1),
- "width", GST_PROPS_INT(8),
- "depth", GST_PROPS_INT(8),
- "signed", GST_PROPS_BOOLEAN(FALSE),
+ "width", GST_PROPS_INT(8),
+ "depth", GST_PROPS_INT(8),
+ "signed", GST_PROPS_BOOLEAN(FALSE),
+ "rate", GST_PROPS_INT_RANGE (8000, 192000),
+ "channels", GST_PROPS_INT_RANGE (1, 2),
NULL));
}
@@ -48,14 +48,14 @@ linear_factory (void)
return
gst_caps_new (
"test_sink",
- "audio/raw",
+ "audio/x-raw-int",
gst_props_new (
- "format", GST_PROPS_STRING ("int"),
- "law", GST_PROPS_INT(0),
- "width", GST_PROPS_INT(16),
- "depth", GST_PROPS_INT(16),
- "signed", GST_PROPS_BOOLEAN(TRUE),
- "endianness", GST_PROPS_INT(G_BYTE_ORDER),
+ "width", GST_PROPS_INT(16),
+ "depth", GST_PROPS_INT(16),
+ "signed", GST_PROPS_BOOLEAN(TRUE),
+ "endianness", GST_PROPS_INT(G_BYTE_ORDER),
+ "rate", GST_PROPS_INT_RANGE (8000, 192000),
+ "channels", GST_PROPS_INT_RANGE (1, 2),
NULL));
}