mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

basetextoverlay: schedule reconfigure on source pad when negotiation fails

Browse source 
The source pad might be flushing while negotiating, resulting in
set_caps or the ALLOCATION query failing. In this case set the
reconfigure flag on the source pad so that negotiation is retried on the
next buffer.
This commit is contained in:
Arnaud Vrac 2014-09-04 15:06:31 +02:00 committed by Sebastian Dröge
parent ef5823cc9b
commit 76ce112994
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/pango/gstbasetextoverlay.c
View file

@ -780,19 +780,23 @@ gst_base_text_overlay_negotiate (GstBaseTextOverlay * overlay, GstCaps * caps)
if (!gst_pad_peer_query (overlay->srcpad, query)) { if (!gst_pad_peer_query (overlay->srcpad, query)) {
/* no problem, we use the query defaults */ /* no problem, we use the query defaults */
GST_DEBUG_OBJECT (overlay, "ALLOCATION query failed"); GST_DEBUG_OBJECT (overlay, "ALLOCATION query failed");
ret = FALSE;
} }
if (caps_has_meta && gst_query_find_allocation_meta (query, if (caps_has_meta && gst_query_find_allocation_meta (query,
GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE, NULL)) GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE, NULL))
attach = TRUE; attach = TRUE;
overlay->attach_compo_to_buffer = attach;
gst_query_unref (query); gst_query_unref (query);
} else {
overlay->attach_compo_to_buffer = FALSE;
} }
if (original_caps && !original_has_meta && !attach) { overlay->attach_compo_to_buffer = attach;
if (!ret && overlay->video_flushing) {
GST_DEBUG_OBJECT (overlay, "negotiation failed, schedule reconfigure");
gst_pad_mark_reconfigure (overlay->srcpad);
} else if (original_caps && !original_has_meta && !attach) {
if (caps_has_meta) { if (caps_has_meta) {
/* Some elements (fakesink) claim to accept the meta on caps but won't /* Some elements (fakesink) claim to accept the meta on caps but won't
put it in the allocation query result, this leads below put it in the allocation query result, this leads below