Commit 1d1b3eb8 authored by Sebastian Dröge's avatar Sebastian Dröge 🍵 Committed by GStreamer Merge Bot

cccombiner: Update for additional info parameter to the "samples-selected" signal

See gstreamer/gstreamer!590

Part-of: <gstreamer/gst-plugins-bad!1498>
parent d1667da0
Pipeline #187940 waiting for manual action with stages
in 58 seconds
......@@ -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;
......
......@@ -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 =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment