From ccd24a357741524e6cc7e102d57804036e71a084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 18 Dec 2014 22:03:04 +0100 Subject: [PATCH] videoaggregator: Make sure to always update the pad's videoinfo together with buffers Otherwise the videoinfo and the buffer content can go out of sync. --- gst-libs/gst/video/gstvideoaggregator.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index a8c004d0fe..9a6374a788 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -987,6 +987,8 @@ gst_videoaggregator_fill_queues (GstVideoAggregator * vagg, gst_buffer_unref (buf); buf = gst_aggregator_pad_steal_buffer (bpad); gst_buffer_replace (&pad->buffer, buf); + pad->buffer_vinfo = *vinfo; + /* FIXME: Set start_time and end_time to something here? */ gst_buffer_unref (buf); GST_DEBUG_OBJECT (pad, "buffer duration is -1"); continue; @@ -1063,6 +1065,9 @@ gst_videoaggregator_fill_queues (GstVideoAggregator * vagg, eos = FALSE; } else { gst_buffer_replace (&pad->buffer, buf); + pad->buffer_vinfo = *vinfo; + pad->priv->start_time = start_time; + pad->priv->end_time = end_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),