mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

Sorry Dave... Add mpegversion=1 to mp3 caps everywhere so that the autoplugger uses mad and not faad for mp3 decoding...

Browse source 
Original commit message from CVS:
Sorry Dave... Add mpegversion=1 to mp3 caps everywhere so that the autoplugger uses mad and not faad for mp3 decoding. This should fix mp3 playback.
This commit is contained in:
Ronald S. Bultje 2003-12-18 09:31:50 +00:00
parent 21583d6f97
commit 0dd9705d85
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst-libs/gst/riff/riff-media.c
View file

@ -233,8 +233,9 @@ gst_riff_create_audio_caps (guint16 codec_id,
case GST_RIFF_WAVE_FORMAT_MPEGL12: /* mp1 or mp2 */ case GST_RIFF_WAVE_FORMAT_MPEGL12: /* mp1 or mp2 */
caps = GST_CAPS_NEW ("riff_audio_mp1l12", caps = GST_CAPS_NEW ("riff_audio_mp1l12",
"audio/mpeg", "audio/mpeg",
"layer", GST_PROPS_INT (2)); "mpegversion", GST_PROPS_INT (1),
"layer", GST_PROPS_INT (2));
break; break;
case GST_RIFF_WAVE_FORMAT_PCM: /* PCM/wav */ { case GST_RIFF_WAVE_FORMAT_PCM: /* PCM/wav */ {

2
gst/asfdemux/gstasfdemux.c
View file

@ -1257,12 +1257,14 @@ gst_asf_demux_audio_caps (guint16 codec_id,
case GST_RIFF_WAVE_FORMAT_MPEGL3: /* mp3 */ case GST_RIFF_WAVE_FORMAT_MPEGL3: /* mp3 */
caps = GST_ASF_AUD_CAPS_NEW ("asf_demux_audio_src_mp3", caps = GST_ASF_AUD_CAPS_NEW ("asf_demux_audio_src_mp3",
"audio/mpeg", "audio/mpeg",
"mpegversion", GST_PROPS_INT (1),
"layer", GST_PROPS_INT (3)); "layer", GST_PROPS_INT (3));
break; break;
case GST_RIFF_WAVE_FORMAT_MPEGL12: /* mp1 or mp2 */ case GST_RIFF_WAVE_FORMAT_MPEGL12: /* mp1 or mp2 */
caps = GST_ASF_AUD_CAPS_NEW ("asf_demux_audio_src_mp12", caps = GST_ASF_AUD_CAPS_NEW ("asf_demux_audio_src_mp12",
"audio/mpeg", "audio/mpeg",
"mpegversion", GST_PROPS_INT (1),
"layer", GST_PROPS_INT (2)); "layer", GST_PROPS_INT (2));
break; break;

1
gst/asfdemux/gstasfmux.c
View file

@ -183,6 +183,7 @@ GST_PAD_TEMPLATE_FACTORY (audio_sink_factory,
GST_CAPS_NEW ( GST_CAPS_NEW (
"asfmux_sink_audio_mpeg", "asfmux_sink_audio_mpeg",
"audio/mpeg", "audio/mpeg",
"mpegversion", GST_PROPS_INT (1),
"layer", GST_PROPS_INT_RANGE (1, 3), "layer", GST_PROPS_INT_RANGE (1, 3),
"rate", GST_PROPS_INT_RANGE (1000, 96000), "rate", GST_PROPS_INT_RANGE (1000, 96000),
"channels", GST_PROPS_INT_RANGE (1, 2) "channels", GST_PROPS_INT_RANGE (1, 2)

3
gst/mpegstream/gstmpegdemux.c
View file

@ -67,7 +67,8 @@ GST_PAD_TEMPLATE_FACTORY (audio_factory,
GST_CAPS_NEW ( GST_CAPS_NEW (
"mpeg_demux_audio", "mpeg_demux_audio",
"audio/mpeg", "audio/mpeg",
NULL "mpegversion", GST_PROPS_INT (1),
"layer", GST_PROPS_INT_RANGE (1, 2)
) )
); );