From: Sebastian Dröge Date: Fri, 7 Aug 2020 06:37:20 +0000 (+0300) Subject: cccombiner: Update for additional info parameter to the "samples-selected" signal X-Git-Tag: 1.19.3~507^2~1491 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d1b3eb8b48d421e28004a18b3f44b13d4b20861;p=platform%2Fupstream%2Fgstreamer.git cccombiner: Update for additional info parameter to the "samples-selected" signal See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/590 Part-of: --- diff --git a/ext/closedcaption/gstcccombiner.c b/ext/closedcaption/gstcccombiner.c index ce627bc..20c5587 100644 --- a/ext/closedcaption/gstcccombiner.c +++ b/ext/closedcaption/gstcccombiner.c @@ -100,7 +100,7 @@ gst_cc_combiner_collect_captions (GstCCCombiner * self, gboolean timeout) self->current_video_buffer = NULL; gst_aggregator_selected_samples (GST_AGGREGATOR_CAST (self), GST_BUFFER_PTS (video_buf), GST_BUFFER_DTS (video_buf), - GST_BUFFER_DURATION (video_buf)); + GST_BUFFER_DURATION (video_buf), NULL); goto done; } @@ -209,7 +209,7 @@ gst_cc_combiner_collect_captions (GstCCCombiner * self, gboolean timeout) gst_aggregator_selected_samples (GST_AGGREGATOR_CAST (self), GST_BUFFER_PTS (self->current_video_buffer), GST_BUFFER_DTS (self->current_video_buffer), - GST_BUFFER_DURATION (self->current_video_buffer)); + GST_BUFFER_DURATION (self->current_video_buffer), NULL); if (self->current_frame_captions->len > 0) { guint i; diff --git a/tests/check/elements/cccombiner.c b/tests/check/elements/cccombiner.c index 82533e9..863da0d 100644 --- a/tests/check/elements/cccombiner.c +++ b/tests/check/elements/cccombiner.c @@ -70,7 +70,9 @@ GstBuffer *expected_video_buffer = NULL; GstBuffer *expected_caption_buffer = NULL; static void -samples_selected_cb (GstAggregator * agg) +samples_selected_cb (GstAggregator * agg, GstSegment * segment, + GstClockTime pts, GstClockTime dts, GstClockTime duration, + GstStructure * info, gpointer user_data) { GstBufferList *buflist; GstPad *caption_pad =