mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 18:21:04 +00:00
Sorry Dave... Add mpegversion=1 to mp3 caps everywhere so that the autoplugger uses mad and not faad for mp3 decoding...
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:
parent
21583d6f97
commit
0dd9705d85
4 changed files with 8 additions and 3 deletions
|
@ -233,8 +233,9 @@ gst_riff_create_audio_caps (guint16 codec_id,
|
|||
|
||||
case GST_RIFF_WAVE_FORMAT_MPEGL12: /* mp1 or mp2 */
|
||||
caps = GST_CAPS_NEW ("riff_audio_mp1l12",
|
||||
"audio/mpeg",
|
||||
"layer", GST_PROPS_INT (2));
|
||||
"audio/mpeg",
|
||||
"mpegversion", GST_PROPS_INT (1),
|
||||
"layer", GST_PROPS_INT (2));
|
||||
break;
|
||||
|
||||
case GST_RIFF_WAVE_FORMAT_PCM: /* PCM/wav */ {
|
||||
|
|
|
@ -1257,12 +1257,14 @@ gst_asf_demux_audio_caps (guint16 codec_id,
|
|||
case GST_RIFF_WAVE_FORMAT_MPEGL3: /* mp3 */
|
||||
caps = GST_ASF_AUD_CAPS_NEW ("asf_demux_audio_src_mp3",
|
||||
"audio/mpeg",
|
||||
"mpegversion", GST_PROPS_INT (1),
|
||||
"layer", GST_PROPS_INT (3));
|
||||
break;
|
||||
|
||||
case GST_RIFF_WAVE_FORMAT_MPEGL12: /* mp1 or mp2 */
|
||||
caps = GST_ASF_AUD_CAPS_NEW ("asf_demux_audio_src_mp12",
|
||||
"audio/mpeg",
|
||||
"mpegversion", GST_PROPS_INT (1),
|
||||
"layer", GST_PROPS_INT (2));
|
||||
break;
|
||||
|
||||
|
|
|
@ -183,6 +183,7 @@ GST_PAD_TEMPLATE_FACTORY (audio_sink_factory,
|
|||
GST_CAPS_NEW (
|
||||
"asfmux_sink_audio_mpeg",
|
||||
"audio/mpeg",
|
||||
"mpegversion", GST_PROPS_INT (1),
|
||||
"layer", GST_PROPS_INT_RANGE (1, 3),
|
||||
"rate", GST_PROPS_INT_RANGE (1000, 96000),
|
||||
"channels", GST_PROPS_INT_RANGE (1, 2)
|
||||
|
|
|
@ -67,7 +67,8 @@ GST_PAD_TEMPLATE_FACTORY (audio_factory,
|
|||
GST_CAPS_NEW (
|
||||
"mpeg_demux_audio",
|
||||
"audio/mpeg",
|
||||
NULL
|
||||
"mpegversion", GST_PROPS_INT (1),
|
||||
"layer", GST_PROPS_INT_RANGE (1, 2)
|
||||
)
|
||||
);
|
||||
|
||||
|
|
Loading…
Reference in a new issue