videoaggregator: Correct use of start_time/end_time
authorJan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
Tue, 22 Feb 2022 14:08:48 +0000 (15:08 +0100)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Tue, 22 Feb 2022 16:00:54 +0000 (16:00 +0000)
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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1779>

subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c

index 75bd663..cc63444 100644 (file)
@@ -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);