mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +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:48 +00:00
parent 75c76000f1
commit 4ee3b353e9
1 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -111,6 +111,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_MP2: case CODEC_ID_MP2:
caps = GST_FF_AUD_CAPS_NEW ("ffmpeg_mp2", caps = GST_FF_AUD_CAPS_NEW ("ffmpeg_mp2",
"audio/mpeg", "audio/mpeg",
"mpegversion", GST_PROPS_INT (1),
"layer", GST_PROPS_INT (2) "layer", GST_PROPS_INT (2)
); );
break; break;
@ -118,6 +119,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_MP3LAME: case CODEC_ID_MP3LAME:
caps = GST_FF_AUD_CAPS_NEW ("ffmpeg_mp3", caps = GST_FF_AUD_CAPS_NEW ("ffmpeg_mp3",
"audio/mpeg", "audio/mpeg",
"mpegversion", GST_PROPS_INT (1),
"layer", GST_PROPS_INT (3) "layer", GST_PROPS_INT (3)
); );
break; break;
@ -1261,6 +1263,16 @@ gst_ffmpeg_caps_to_codecid (GstCaps *caps,
} else if (!strcmp(mimetype, "audio/mpeg")) { } else if (!strcmp(mimetype, "audio/mpeg")) {
if (gst_caps_has_property (caps, "mpegversion")) {
gint mpegversion = 0;
gst_caps_get_int (caps, "mpegversion", &mpegversion);
switch (mpegversion) {
case 2: /* ffmpeg uses faad for both... */
case 4:
id = CODEC_ID_MPEG4AAC;
break;
case 1:
if (gst_caps_has_property (caps, "layer")) { if (gst_caps_has_property (caps, "layer")) {
gint layer = 0; gint layer = 0;
@ -1271,18 +1283,16 @@ gst_ffmpeg_caps_to_codecid (GstCaps *caps,
id = CODEC_ID_MP2; id = CODEC_ID_MP2;
break; break;
case 3: case 3:
id = CODEC_ID_MP3LAME; id = CODEC_ID_MP3;
break; break;
default: default:
/* ... */ /* ... */
break; break;
} }
} else if (gst_caps_has_property (caps, "mpegversion")) { }
gint mpegversion = 0; default:
/* ... */
gst_caps_get_int (caps, "mpegversion", &mpegversion); break;
if (mpegversion == 4) {
id = CODEC_ID_MPEG4AAC;
} }
} }