From 61064257ef24a4dcd4f3e1c0192ca505482c07cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 7 Aug 2020 09:34:37 +0300 Subject: [PATCH] videoaggregator: Update for additional info parameter to the "samples-selected" signal See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/590 Part-of: --- gst-libs/gst/video/gstvideoaggregator.c | 2 +- tests/check/elements/compositor.c | 3 ++- tests/examples/compositor/signals.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index d6fae1b49d..61cf22ec6b 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -1773,7 +1773,7 @@ gst_video_aggregator_do_aggregate (GstVideoAggregator * vagg, /* Let the application know that input buffers have been staged */ gst_aggregator_selected_samples (agg, GST_BUFFER_PTS (*outbuf), - GST_BUFFER_DTS (*outbuf), GST_BUFFER_DURATION (*outbuf)); + GST_BUFFER_DTS (*outbuf), GST_BUFFER_DURATION (*outbuf), NULL); /* Convert all the frames the subclass has before aggregating */ gst_element_foreach_sink_pad (GST_ELEMENT_CAST (vagg), prepare_frames, NULL); diff --git a/tests/check/elements/compositor.c b/tests/check/elements/compositor.c index 958cca61bd..940059bbdc 100644 --- a/tests/check/elements/compositor.c +++ b/tests/check/elements/compositor.c @@ -2170,7 +2170,8 @@ static GstBuffer *expected_selected_buffer = NULL; static void samples_selected_cb (GstAggregator * agg, GstSegment * segment, - GstClockTime pts, GstClockTime dts, GstClockTime duration, gint * called) + GstClockTime pts, GstClockTime dts, GstClockTime duration, + GstStructure * info, gint * called) { GstPad *pad; GstSample *sample; diff --git a/tests/examples/compositor/signals.c b/tests/examples/compositor/signals.c index b74c9b4506..c9b61dc7f4 100644 --- a/tests/examples/compositor/signals.c +++ b/tests/examples/compositor/signals.c @@ -62,7 +62,8 @@ check_aggregated_buffer (GstElement * agg, GstPad * pad, static void samples_selected_cb (GstElement * agg, GstSegment * segment, GstClockTime pts, - GstClockTime dts, GstClockTime duration, GHashTable * consumed_buffers) + GstClockTime dts, GstClockTime duration, GstStructure * info, + GHashTable * consumed_buffers) { gst_printerr ("Compositor has selected the samples it will aggregate for output buffer with PTS %"