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

videoaggregator: simplify aggregate returning

Browse source 
Rework special handling with goto/labels to only have one case
and otherwise just return normally.
This commit is contained in:
Thiago Santos 2015-05-06 14:29:01 -03:00
parent dd14495332
commit 71328df56f
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1345,12 +1345,10 @@ gst_videoaggregator_aggregate (GstAggregator * agg, gboolean timeout)
GST_VIDEO_AGGREGATOR_LOCK (vagg); GST_VIDEO_AGGREGATOR_LOCK (vagg);
flow_ret = gst_videoaggregator_check_reconfigure (vagg, timeout); flow_ret = gst_videoaggregator_check_reconfigure (vagg, timeout);
if (flow_ret == GST_FLOW_NEEDS_DATA) { if (flow_ret != GST_FLOW_OK) {
GST_VIDEO_AGGREGATOR_UNLOCK (vagg); if (flow_ret == GST_FLOW_NEEDS_DATA)
return GST_FLOW_OK; flow_ret = GST_FLOW_OK;
} else if (flow_ret != GST_FLOW_OK) { goto unlock_and_return;
GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
return flow_ret;
} }
output_start_time = gst_videoaggregator_get_next_time (agg); output_start_time = gst_videoaggregator_get_next_time (agg);
@ -1378,14 +1376,13 @@ gst_videoaggregator_aggregate (GstAggregator * agg, gboolean timeout)
if (flow_ret == GST_FLOW_NEEDS_DATA && !timeout) { if (flow_ret == GST_FLOW_NEEDS_DATA && !timeout) {
GST_DEBUG_OBJECT (vagg, "Need more data for decisions"); GST_DEBUG_OBJECT (vagg, "Need more data for decisions");
flow_ret = GST_FLOW_OK; flow_ret = GST_FLOW_OK;
goto done; goto unlock_and_return;
} else if (flow_ret == GST_FLOW_EOS) { } else if (flow_ret == GST_FLOW_EOS) {
GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
GST_DEBUG_OBJECT (vagg, "All sinkpads are EOS -- forwarding"); GST_DEBUG_OBJECT (vagg, "All sinkpads are EOS -- forwarding");
goto done_unlocked; goto unlock_and_return;
} else if (flow_ret == GST_FLOW_ERROR) { } else if (flow_ret == GST_FLOW_ERROR) {
GST_WARNING_OBJECT (vagg, "Error collecting buffers"); GST_WARNING_OBJECT (vagg, "Error collecting buffers");
goto done; goto unlock_and_return;
} }
jitter = gst_videoaggregator_do_qos (vagg, output_start_time); jitter = gst_videoaggregator_do_qos (vagg, output_start_time);
@ -1427,14 +1424,13 @@ gst_videoaggregator_aggregate (GstAggregator * agg, gboolean timeout)
flow_ret = gst_aggregator_finish_buffer (agg, outbuf); flow_ret = gst_aggregator_finish_buffer (agg, outbuf);
} }
goto done_unlocked; return flow_ret;
done: done:
if (outbuf) if (outbuf)
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);
unlock_and_return:
GST_VIDEO_AGGREGATOR_UNLOCK (vagg); GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
done_unlocked:
return flow_ret; return flow_ret;
} }