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

avauddec: use template caps intersection for accept-caps

Browse source 
Avoid doing downstream caps queries when accept-caps should just
do a shallow caps check on the element itself

https://bugzilla.gnome.org/show_bug.cgi?id=753623
This commit is contained in:
Thiago Santos 2015-08-14 08:21:51 -03:00
parent 51896af52b
commit 2b387ba827
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ext/libav/gstavauddec.c
View file

@ -53,6 +53,8 @@ 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);
@ -133,6 +135,8 @@ 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
@ -148,6 +152,8 @@ 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);
}
@ -201,6 +207,25 @@ gst_ffmpegauddec_close (GstFFMpegAudDec * ffmpegdec, gboolean reset)
return TRUE;
}
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)
{