mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 23:32:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/590

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1498>
This commit is contained in:
Sebastian Dröge 2020-08-07 09:37:20 +03:00 committed by GStreamer Merge Bot
parent d1667da0c3
commit 1d1b3eb8b4
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/closedcaption/gstcccombiner.c
View file

@ -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;

4
tests/check/elements/cccombiner.c
View file

@ -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 =