mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix int and float audio caps in auparse, partially fixes bug #142812

Browse source 
Original commit message from CVS:
fix int and float audio caps in auparse, partially fixes bug #142812
This commit is contained in:
Stéphane Loeuillet 2004-12-19 16:54:46 +00:00
parent 328abe52c4
commit 8f66306a15
2 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2004-12-19 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
* gst/auparse/gstauparse.c: fix int and float audio caps
2004-12-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-12-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* sys/v4l/gstv4lelement.c: (gst_v4l_iface_supported): * sys/v4l/gstv4lelement.c: (gst_v4l_iface_supported):

36
gst/auparse/gstauparse.c
View file

@ -49,10 +49,19 @@ static GstStaticPadTemplate gst_auparse_src_template =
GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_SOMETIMES, /* FIXME: spider */ GST_PAD_SOMETIMES, /* FIXME: spider */
GST_STATIC_CAPS (GST_AUDIO_INT_PAD_TEMPLATE_CAPS "; " /* 24-bit PCM is barely supported by gstreamer actually */ GST_STATIC_CAPS (GST_AUDIO_INT_PAD_TEMPLATE_CAPS "; "
GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS "; " /* 64-bit float is barely supported by gstreamer actually */ /* we don't use GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS
"audio/x-alaw, " "rate = (int) [ 8000, 192000 ], " because of min buffer-frames which is 1, not 0 */
"channels = (int) [ 1, 2 ]" "; " "audio/x-mulaw, " "audio/x-raw-float, "
"rate = (int) [ 1, MAX ], "
"channels = (int) [ 1, MAX ], "
"endianness = (int) { LITTLE_ENDIAN , BIG_ENDIAN }, "
"width = (int) { 32, 64 }, "
"buffer-frames = (int) [ 0, MAX]" "; "
"audio/x-alaw, "
"rate = (int) [ 8000, 192000 ], "
"channels = (int) [ 1, 2 ]" "; "
"audio/x-mulaw, "
"rate = (int) [ 8000, 192000 ], " "channels = (int) [ 1, 2 ]" "; " "rate = (int) [ 8000, 192000 ], " "channels = (int) [ 1, 2 ]" "; "
/* Nothing to decode those ADPCM streams for now */ /* Nothing to decode those ADPCM streams for now */
"audio/x-adpcm, " "layout = (string) { g721, g722, g723_3, g723_5 }") "audio/x-adpcm, " "layout = (string) { g721, g722, g723_3, g723_5 }")
@ -320,23 +329,26 @@ Samples :
if (law) { if (law) {
tempcaps = tempcaps =
gst_caps_new_simple ((law == 1) ? "audio/x-mulaw" : "audio/x-alaw", gst_caps_new_simple ((law == 1) ? "audio/x-mulaw" : "audio/x-alaw",
"rate", G_TYPE_INT, auparse->frequency, "channels", G_TYPE_INT, "rate", G_TYPE_INT, auparse->frequency,
auparse->channels, NULL); "channels", G_TYPE_INT, auparse->channels, NULL);
} else if (ieee) { } else if (ieee) {
tempcaps = gst_caps_new_simple ("audio/x-raw-float", tempcaps = gst_caps_new_simple ("audio/x-raw-float",
"width", G_TYPE_INT, depth, "rate", G_TYPE_INT, auparse->frequency,
"channels", G_TYPE_INT, auparse->channels,
"endianness", G_TYPE_INT, "endianness", G_TYPE_INT,
auparse->le ? G_LITTLE_ENDIAN : G_BIG_ENDIAN, NULL); auparse->le ? G_LITTLE_ENDIAN : G_BIG_ENDIAN, "width", G_TYPE_INT,
depth, "buffer-frames", G_TYPE_INT, 0, NULL);
} else if (layout[0]) { } else if (layout[0]) {
tempcaps = gst_caps_new_simple ("audio/x-adpcm", tempcaps = gst_caps_new_simple ("audio/x-adpcm",
"layout", G_TYPE_STRING, layout, NULL); "layout", G_TYPE_STRING, layout, NULL);
} else { } else {
tempcaps = gst_caps_new_simple ("audio/x-raw-int", tempcaps = gst_caps_new_simple ("audio/x-raw-int",
"rate", G_TYPE_INT, auparse->frequency,
"channels", G_TYPE_INT, auparse->channels,
"endianness", G_TYPE_INT, "endianness", G_TYPE_INT,
auparse->le ? G_LITTLE_ENDIAN : G_BIG_ENDIAN, "rate", G_TYPE_INT, auparse->le ? G_LITTLE_ENDIAN : G_BIG_ENDIAN, "depth", G_TYPE_INT,
auparse->frequency, "channels", G_TYPE_INT, auparse->channels, depth, "width", G_TYPE_INT, depth, "signed", G_TYPE_BOOLEAN, TRUE,
"depth", G_TYPE_INT, depth, "width", G_TYPE_INT, depth, "signed", NULL);
G_TYPE_BOOLEAN, TRUE, NULL);
} }
if (!gst_pad_set_explicit_caps (auparse->srcpad, tempcaps)) { if (!gst_pad_set_explicit_caps (auparse->srcpad, tempcaps)) {