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

videoaggregator: Pop out old buffers on timeout

Browse source 
This situation happens in the situation where an input stream has a framerate
exceeding the timeout latency (Ex: 1fps with a latency of 500ms) and an input
stream greater than output framerate (ex: 60fps in, 30 fps out).

The problem that would happen is that we would timeout, but then buffers from
the fast input stream would only be popped out one by one.... until a buffer
reaches the low-framerate input stream at which point they would quickly be
popped out/used. The resulting output would be "slow ... fast ... slow ... fast"
of that input fast stream.

In order to avoid this situation, whenever we detect a late buffer, check if
there's a next one and re-check with that one.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/990>
This commit is contained in:
Edward Hervey 2020-12-30 14:56:54 +01:00 committed by Edward Hervey
parent e0a4d3ac4e
commit 65b6994df6
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1556,7 +1556,7 @@ gst_video_aggregator_reset (GstVideoAggregator * vagg)
static GstFlowReturn static GstFlowReturn
gst_video_aggregator_fill_queues (GstVideoAggregator * vagg, gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
GstClockTime output_start_running_time, GstClockTime output_start_running_time,
GstClockTime output_end_running_time) GstClockTime output_end_running_time, gboolean timeout)
{ {
GList *l; GList *l;
gboolean eos = TRUE; gboolean eos = TRUE;
@ -1590,6 +1590,9 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
if (buf) { if (buf) {
GstClockTime start_time, end_time; GstClockTime start_time, end_time;
check_again:
GST_TRACE_OBJECT (pad, "Next buffer %" GST_PTR_FORMAT, buf);
start_time = GST_BUFFER_TIMESTAMP (buf); start_time = GST_BUFFER_TIMESTAMP (buf);
if (start_time == -1) { if (start_time == -1) {
gst_buffer_unref (buf); gst_buffer_unref (buf);
@ -1630,6 +1633,13 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_aggregator_pad_drop_buffer (bpad); gst_aggregator_pad_drop_buffer (bpad);
pad->priv->start_time = start_time; pad->priv->start_time = start_time;
if (timeout) {
/* If we're called for a timeout, we want to make sure we drain as
* much as possible any late data */
buf = gst_aggregator_pad_peek_buffer (bpad);
if (buf)
goto check_again;
}
need_more_data = TRUE; need_more_data = TRUE;
continue; continue;
} }
@ -2037,7 +2047,7 @@ gst_video_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
} else { } else {
flow_ret = flow_ret =
gst_video_aggregator_fill_queues (vagg, output_start_running_time, gst_video_aggregator_fill_queues (vagg, output_start_running_time,
output_end_running_time); output_end_running_time, timeout);
} }
if (flow_ret == GST_AGGREGATOR_FLOW_NEED_DATA && !timeout) { if (flow_ret == GST_AGGREGATOR_FLOW_NEED_DATA && !timeout) {