Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
videoaggregator: Update for additional info parameter to the "samples…
  • Loading branch information
sdroege committed Aug 7, 2020
1 parent 61800dd commit 6106425
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gst-libs/gst/video/gstvideoaggregator.c
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion tests/check/elements/compositor.c
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion tests/examples/compositor/signals.c
Expand Up @@ -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 %"
Expand Down

0 comments on commit 6106425

Please sign in to comment.