mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-26 09:08:14 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: 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-base/-/merge_requests/780>
This commit is contained in:
Sebastian Dröge 2020-08-07 09:34:37 +03:00
parent 61800dd435
commit 61064257ef
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -1773,7 +1773,7 @@ gst_video_aggregator_do_aggregate (GstVideoAggregator * vagg,
/* Let the application know that input buffers have been staged */ /* Let the application know that input buffers have been staged */
gst_aggregator_selected_samples (agg, GST_BUFFER_PTS (*outbuf), 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 */ /* Convert all the frames the subclass has before aggregating */
gst_element_foreach_sink_pad (GST_ELEMENT_CAST (vagg), prepare_frames, NULL); gst_element_foreach_sink_pad (GST_ELEMENT_CAST (vagg), prepare_frames, NULL);

3
tests/check/elements/compositor.c
View file

@ -2170,7 +2170,8 @@ static GstBuffer *expected_selected_buffer = NULL;
static void static void
samples_selected_cb (GstAggregator * agg, GstSegment * segment, 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; GstPad *pad;
GstSample *sample; GstSample *sample;

3
tests/examples/compositor/signals.c
View file

@ -62,7 +62,8 @@ check_aggregated_buffer (GstElement * agg, GstPad * pad,
static void static void
samples_selected_cb (GstElement * agg, GstSegment * segment, GstClockTime pts, 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 gst_printerr
("Compositor has selected the samples it will aggregate for output buffer with PTS %" ("Compositor has selected the samples it will aggregate for output buffer with PTS %"