videoaggregator: Update for additional info parameter to the "samples-selected" signal
authorSebastian Dröge <sebastian@centricular.com>
Fri, 7 Aug 2020 06:34:37 +0000 (09:34 +0300)
committerSebastian Dröge <sebastian@centricular.com>
Fri, 7 Aug 2020 06:34:37 +0000 (09:34 +0300)
See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/590

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/780>

gst-libs/gst/video/gstvideoaggregator.c
tests/check/elements/compositor.c
tests/examples/compositor/signals.c

index d6fae1b..61cf22e 100644 (file)
@@ -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);
index 958cca6..940059b 100644 (file)
@@ -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;
index b74c9b4..c9b61dc 100644 (file)
@@ -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 %"