diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-07-06 20:49:52 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-07-06 20:49:52 +0000 |
| commit | 292fec2a0bd1f221a46ad69c5100995d04c01057 (patch) | |
| tree | 658db299e0e03b2454ff840730569d79539e67c4 /sys/oss/gstossgst.c | |
| parent | a8183e9a3fa87cf4247c7df16207f440ea4069c0 (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 'sys/oss/gstossgst.c')
| -rw-r--r-- | sys/oss/gstossgst.c | 48 |
1 files changed, 40 insertions, 8 deletions
diff --git a/sys/oss/gstossgst.c b/sys/oss/gstossgst.c index 71feae36..070c693a 100644 --- a/sys/oss/gstossgst.c +++ b/sys/oss/gstossgst.c @@ -79,10 +79,8 @@ ossgst_src_factory (void) GST_PAD_ALWAYS, gst_caps_new ( "ossgst_src", - "audio/raw", + "audio/x-raw-int", gst_props_new ( - "format", GST_PROPS_STRING ("int"), - "law", GST_PROPS_INT (0), "endianness", GST_PROPS_INT (G_BYTE_ORDER), "signed", GST_PROPS_LIST ( GST_PROPS_BOOLEAN (FALSE), @@ -99,7 +97,21 @@ ossgst_src_factory (void) "rate", GST_PROPS_INT_RANGE (8000, 48000), "channels", GST_PROPS_INT_RANGE (1, 2), NULL)), - NULL); + gst_caps_new ( + "ossgst_src", + "audio/x-mulaw", + gst_props_new ( + "rate", GST_PROPS_INT_RANGE (8000, 48000), + "channels", GST_PROPS_INT_RANGE (1, 2), + NULL)), + gst_caps_new ( + "ossgst_src", + "audio/x-alaw", + gst_props_new ( + "rate", GST_PROPS_INT_RANGE (8000, 48000), + "channels", GST_PROPS_INT_RANGE (1, 2), + NULL)), + NULL); } @@ -224,12 +236,12 @@ gst_ossgst_format_to_caps (gint format, gint stereo, gint rate) } if (supported) { - caps = gst_caps_new ( + switch (law) { + case 0: + caps = gst_caps_new ( "ossgst_caps", - "audio/raw", + "audio/x-raw-int", gst_props_new ( - "format", GST_PROPS_STRING ("int"), - "law", GST_PROPS_INT (law), "endianness", GST_PROPS_INT (endianness), "signed", GST_PROPS_BOOLEAN (is_signed), "width", GST_PROPS_INT (width), @@ -237,6 +249,26 @@ gst_ossgst_format_to_caps (gint format, gint stereo, gint rate) "rate", GST_PROPS_INT (rate), "channels", GST_PROPS_INT (stereo?2:1), NULL)); + break; + case 1: + caps = gst_caps_new ( + "ossgst_caps", + "audio/x-mulaw", + gst_props_new ( + "rate", GST_PROPS_INT (rate), + "channels", GST_PROPS_INT (stereo?2:1), + NULL)); + break; + case 2: + caps = gst_caps_new ( + "ossgst_caps", + "audio/x-alaw", + gst_props_new ( + "rate", GST_PROPS_INT (rate), + "channels", GST_PROPS_INT (stereo?2:1), + NULL)); + break; + } } else { g_warning ("gstossgst: program tried to use unsupported format %x\n", format); |