diff options
author | Thiago Santos <thiagoss@osg.samsung.com> | 2015-08-21 16:15:38 -0300 |
---|---|---|
committer | Thiago Santos <thiagoss@osg.samsung.com> | 2015-08-21 16:15:38 -0300 |
commit | 80002908af7b6cfada1a02b53a5d493724b9bfd0 (patch) | |
tree | 1fa9c1cfd43b054c0e82d08cf9666c60cb2ac80a | |
parent | 03bfa3a6c08bad22d02ca4290af8f2643569ecc9 (diff) |
Revert "avauddec: use template caps intersection for accept-caps"reverted-acceptcaps
This reverts commit 2b387ba827313c6835e3877653ea9571bb9a9086.
-rw-r--r-- | ext/libav/gstavauddec.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c index fbce56f..17eb773 100644 --- a/ext/libav/gstavauddec.c +++ b/ext/libav/gstavauddec.c @@ -53,8 +53,6 @@ static gboolean gst_ffmpegauddec_set_format (GstAudioDecoder * decoder, GstCaps * caps); static GstFlowReturn gst_ffmpegauddec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf); -static gboolean gst_ffmpegauddec_sink_query (GstAudioDecoder * decoder, - GstQuery * query); static gboolean gst_ffmpegauddec_negotiate (GstFFMpegAudDec * ffmpegdec, AVCodecContext * context, AVFrame * frame, gboolean force); @@ -135,8 +133,6 @@ gst_ffmpegauddec_class_init (GstFFMpegAudDecClass * klass) gstaudiodecoder_class->flush = GST_DEBUG_FUNCPTR (gst_ffmpegauddec_flush); gstaudiodecoder_class->propose_allocation = GST_DEBUG_FUNCPTR (gst_ffmpegauddec_propose_allocation); - gstaudiodecoder_class->sink_query = - GST_DEBUG_FUNCPTR (gst_ffmpegauddec_sink_query); } static void @@ -152,8 +148,6 @@ gst_ffmpegauddec_init (GstFFMpegAudDec * ffmpegdec) ffmpegdec->frame = av_frame_alloc (); - GST_PAD_SET_ACCEPT_TEMPLATE (GST_VIDEO_DECODER_SINK_PAD (ffmpegdec)); - gst_audio_decoder_set_drainable (GST_AUDIO_DECODER (ffmpegdec), TRUE); gst_audio_decoder_set_needs_format (GST_AUDIO_DECODER (ffmpegdec), TRUE); } @@ -208,25 +202,6 @@ gst_ffmpegauddec_close (GstFFMpegAudDec * ffmpegdec, gboolean reset) } static gboolean -gst_ffmpegauddec_sink_query (GstAudioDecoder * decoder, GstQuery * query) -{ - gboolean ret; - - switch (GST_QUERY_TYPE (query)) { - case GST_QUERY_ACCEPT_CAPS: - /* resort to the default accept-caps query handling to skip the videodecoder handling */ - ret = - gst_pad_query_default (GST_AUDIO_DECODER_SINK_PAD (decoder), - GST_OBJECT_CAST (decoder), query); - break; - default: - ret = gst_audio_decoder_sink_query_default (decoder, query); - break; - } - return ret; -} - -static gboolean gst_ffmpegauddec_start (GstAudioDecoder * decoder) { GstFFMpegAudDec *ffmpegdec = (GstFFMpegAudDec *) decoder; |