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

textoverlay: Mark pad as needing reconfiguration again if it failed

Browse source 
And return FLUSHING instead of NOT_NEGOTIATED on flushing pads.

https://bugzilla.gnome.org/show_bug.cgi?id=774623
This commit is contained in:
Sebastian Dröge 2016-11-17 20:18:55 +02:00
parent b9f59fd999
commit d34e326425
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/pango/gstbasetextoverlay.c
View file

@ -923,12 +923,16 @@ gst_base_text_overlay_negotiate (GstBaseTextOverlay * overlay, GstCaps * caps)
gst_caps_unref (overlay_caps);
gst_caps_unref (caps);
if (!ret)
gst_pad_mark_reconfigure (overlay->srcpad);
return ret;
no_format:
{
if (caps)
gst_caps_unref (caps);
gst_pad_mark_reconfigure (overlay->srcpad);
return FALSE;
}
}
@ -2211,8 +2215,16 @@ gst_base_text_overlay_push_frame (GstBaseTextOverlay * overlay,
if (overlay->composition == NULL)
goto done;
if (gst_pad_check_reconfigure (overlay->srcpad))
gst_base_text_overlay_negotiate (overlay, NULL);
if (gst_pad_check_reconfigure (overlay->srcpad)) {
if (!gst_base_text_overlay_negotiate (overlay, NULL)) {
gst_pad_mark_reconfigure (overlay->srcpad);
gst_buffer_unref (video_frame);
if (GST_PAD_IS_FLUSHING (overlay->srcpad))
return GST_FLOW_FLUSHING;
else
return GST_FLOW_NOT_NEGOTIATED;
}
}
video_frame = gst_buffer_make_writable (video_frame);