diff options
| author | Stéphane Loeuillet <gstreamer@leroutier.net> | 2004-05-13 21:27:14 +0000 |
|---|---|---|
| committer | Stéphane Loeuillet <gstreamer@leroutier.net> | 2004-05-13 21:27:14 +0000 |
| commit | 61a021fbba546c6fe5bc1faecfcf3be1c9f8cde9 (patch) | |
| tree | d257e239c3b356f38e57061670486bf5856dccc6 /gst/auparse | |
| parent | 59f3c16b0c1a42b056e58fd967d0c72b21ed52ac (diff) | |
ext/mad/gstid3tag.c: move from "Codec/(Dem/M)uxer" to "Codec/(Dem/M)uxer/Audio"
Original commit message from CVS:
* ext/mad/gstid3tag.c : move from "Codec/(Dem/M)uxer" to "Codec/(Dem/M)uxer/Audio"
* gst/wavenc/gstwavenc.c : move from "Codec/Encoder/Audio" to "Codec/Muxer/Audio"
* gst/auparse/gstauparse.c :
- add code (commented for now) to support audio/x-adpcm on src pad
(we have no decoder for those layout yet)
* gst/cdxaparse/gstcdxaparse.c :
* gst/cdxaparse/gstcdxaparse.h :
- partial rewrite using RiffRead (ripped iain's wavparse code)
* gst/rtp/gstrtpL16enc.c : typo
* gst/rtp/gstrtpgsmenc.c : typo
Diffstat (limited to 'gst/auparse')
| -rw-r--r-- | gst/auparse/gstauparse.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c index 5e16d3e4..f3dacd05 100644 --- a/gst/auparse/gstauparse.c +++ b/gst/auparse/gstauparse.c @@ -51,11 +51,10 @@ static GstStaticPadTemplate gst_auparse_src_template = GST_PAD_SOMETIMES, /* FIXME: spider */ GST_STATIC_CAPS (GST_AUDIO_INT_PAD_TEMPLATE_CAPS "; " /* 24-bit PCM is barely supported by gstreamer actually */ GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS "; " /* 64-bit float is barely supported by gstreamer actually */ - "audio/x-alaw, " - "rate = (int) [ 8000, 192000 ], " - "channels = (int) [ 1, 2 ]; " - "audio/x-mulaw, " - "rate = (int) [ 8000, 192000 ], " "channels = (int) [ 1, 2 ]") + "audio/x-alaw, " "rate = (int) [ 8000, 192000 ], " "channels = (int) [ 1, 2 ]; " "audio/x-mulaw, " "rate = (int) [ 8000, 192000 ], " "channels = (int) [ 1, 2 ]" /*"; " + "audio/x-adpcm, " + "layout = (string) { g721, g722, g723_3, g723_5 }" */ ) + /* Nothing to decode those ADPCM streams for now */ ); /* AuParse signals and args */ @@ -314,6 +313,11 @@ Samples : "width", G_TYPE_INT, depth, "endianness", G_TYPE_INT, auparse->le ? G_LITTLE_ENDIAN : G_BIG_ENDIAN, NULL); +/* + } else if (layout) { + tempcaps = gst_caps_new_simple ("audio/x-adpcm", + "layout", G_TYPE_STRING, layout, NULL); +*/ } else { tempcaps = gst_caps_new_simple ("audio/x-raw-int", "endianness", G_TYPE_INT, |