mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 10:10:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

videodecoder: Handle CAPS events immediately instead of delaying them

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=733147
This commit is contained in:
Sebastian Dröge 2014-07-11 21:51:05 +02:00
parent 960f676407
commit 11ef208736
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst-libs/gst/video/gstvideodecoder.c
View file

@ -337,7 +337,6 @@ struct _GstVideoDecoderPrivate
gboolean had_input_data; gboolean had_input_data;
gboolean needs_format; gboolean needs_format;
gboolean do_caps;
/* ... being tracked here; /* ... being tracked here;
* only available during parsing */ * only available during parsing */
@ -1053,8 +1052,10 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
} }
case GST_EVENT_CAPS: case GST_EVENT_CAPS:
{ {
ret = TRUE; GstCaps *caps;
decoder->priv->do_caps = TRUE;
gst_event_parse_caps (event, &caps);
ret = gst_video_decoder_setcaps (decoder, caps);
gst_event_unref (event); gst_event_unref (event);
event = NULL; event = NULL;
break; break;
@ -2126,18 +2127,6 @@ gst_video_decoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
decoder = GST_VIDEO_DECODER (parent); decoder = GST_VIDEO_DECODER (parent);
if (G_UNLIKELY (decoder->priv->do_caps)) {
GstCaps *caps = gst_pad_get_current_caps (decoder->sinkpad);
if (caps) {
if (!gst_video_decoder_setcaps (decoder, caps)) {
gst_caps_unref (caps);
goto not_negotiated;
}
gst_caps_unref (caps);
}
decoder->priv->do_caps = FALSE;
}
if (G_UNLIKELY (!decoder->priv->input_state && decoder->priv->needs_format)) if (G_UNLIKELY (!decoder->priv->input_state && decoder->priv->needs_format))
goto not_negotiated; goto not_negotiated;