From 4567d569ca62d3a4ad09b8d20e391ec4253d6437 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 22 Feb 2022 15:08:48 +0100 Subject: [PATCH] videoaggregator: Correct use of start_time/end_time When 29713c5d changed most uses of `start_time` and `end_time` to `start_running_time` and `end_running_time`, it missed two. Fixes: 29713c5d40a1d7d1f21dada68f55f7a97f0b7025 Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1038 Part-of: --- subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c b/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c index 75bd663..cc63444 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c @@ -1876,7 +1876,7 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg, GST_TIME_ARGS (output_start_running_time), GST_TIME_ARGS (output_end_running_time)); - if (pad->priv->end_time != -1 && pad->priv->end_time > end_time) { + if (pad->priv->end_time != -1 && pad->priv->end_time > end_running_time) { GST_DEBUG_OBJECT (pad, "Buffer from the past, dropping"); gst_buffer_unref (buf); gst_aggregator_pad_drop_buffer (bpad); @@ -1920,7 +1920,7 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg, pad->priv->end_time = end_running_time; GST_DEBUG_OBJECT (pad, "replacing old buffer with a newer buffer, start %" GST_TIME_FORMAT - " out end %" GST_TIME_FORMAT, GST_TIME_ARGS (start_time), + " out end %" GST_TIME_FORMAT, GST_TIME_ARGS (start_running_time), GST_TIME_ARGS (output_end_running_time)); gst_buffer_unref (buf); gst_aggregator_pad_drop_buffer (bpad); -- 2.7.4