From 87106ca6c7a1e6b1f4da4af67ad08a37b0acfff3 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 25 Oct 2006 17:20:25 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegcodecmap.c: Fix AMR caps. Fixes #364956. Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), (gst_ffmpeg_caps_to_codecid): Fix AMR caps. Fixes #364956. * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_get_stream): Activate pads before adding them. --- ChangeLog | 9 +++++++++ ext/ffmpeg/gstffmpegcodecmap.c | 8 ++++---- ext/ffmpeg/gstffmpegdemux.c | 2 ++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40c6458c7e..dcd0d75c12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-10-25 Wim Taymans + + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), + (gst_ffmpeg_caps_to_codecid): + Fix AMR caps. Fixes #364956. + + * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_get_stream): + Activate pads before adding them. + 2006-10-24 Edward Hervey * ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_collected): diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 48a04fd752..ee38b2ff44 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -845,11 +845,11 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, break; case CODEC_ID_AMR_NB: - caps = gst_ff_aud_caps_new (context, "audio/x-amr-nb", NULL); + caps = gst_ff_aud_caps_new (context, "audio/AMR", NULL); break; case CODEC_ID_AMR_WB: - caps = gst_ff_aud_caps_new (context, "audio/x-amr-wb", NULL); + caps = gst_ff_aud_caps_new (context, "audio/AMR-WB", NULL); break; case CODEC_ID_RA_144: @@ -2228,10 +2228,10 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context) break; } } - } else if (!strcmp (mimetype, "audio/x-amrnb")) { + } else if (!strcmp (mimetype, "audio/AMR")) { audio = TRUE; id = CODEC_ID_AMR_NB; - } else if (!strcmp (mimetype, "audio/x-amrwb")) { + } else if (!strcmp (mimetype, "audio/AMR-WB")) { id = CODEC_ID_AMR_WB; audio = TRUE; } else if (!strcmp (mimetype, "video/x-h264")) { diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index 3436506d25..92e2c3524a 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -867,6 +867,8 @@ gst_ffmpegdemux_get_stream (GstFFMpegDemux * demux, AVStream * avstream) demux->streams[avstream->index] = stream; + /* activate and add */ + gst_pad_set_active (pad, TRUE); gst_element_add_pad (GST_ELEMENT (demux), pad); /* metadata */