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

videoaggregator: Return to parent on reconfigure

Browse source 
The caps negotiation is now in the parent, so need to return there
if a reconfiguration is needed, otherwise it will loops forever.
This commit is contained in:
Olivier Crête 2017-05-21 12:41:53 +02:00
parent 719498601f
commit b488a560ed
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -1445,7 +1445,6 @@ gst_video_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
GST_VIDEO_AGGREGATOR_LOCK (vagg); GST_VIDEO_AGGREGATOR_LOCK (vagg);
restart:
if (GST_VIDEO_INFO_FORMAT (&vagg->info) == GST_VIDEO_FORMAT_UNKNOWN) { if (GST_VIDEO_INFO_FORMAT (&vagg->info) == GST_VIDEO_FORMAT_UNKNOWN) {
if (timeout) if (timeout)
gst_video_aggregator_advance_on_timeout (vagg); gst_video_aggregator_advance_on_timeout (vagg);
@ -1510,7 +1509,8 @@ restart:
*/ */
if (gst_pad_needs_reconfigure (GST_AGGREGATOR_SRC_PAD (vagg))) { if (gst_pad_needs_reconfigure (GST_AGGREGATOR_SRC_PAD (vagg))) {
GST_DEBUG_OBJECT (vagg, "Need reconfigure"); GST_DEBUG_OBJECT (vagg, "Need reconfigure");
goto restart; flow_ret = GST_AGGREGATOR_FLOW_NEED_DATA;
goto unlock_and_return;
} }
GST_DEBUG_OBJECT (vagg, GST_DEBUG_OBJECT (vagg,