mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-01 06:01:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: update to new samples selection API

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/778>
This commit is contained in:
Mathieu Duponchelle 2020-08-05 16:54:19 +02:00
parent 66ff1eedca
commit 1de8af6f8b
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1737,7 +1737,7 @@ clean_pad (GstElement * agg, GstPad * pad, gpointer user_data)
static GstFlowReturn static GstFlowReturn
gst_video_aggregator_do_aggregate (GstVideoAggregator * vagg, gst_video_aggregator_do_aggregate (GstVideoAggregator * vagg,
GstClockTime output_start_time, GstClockTime output_end_time, GstClockTime output_start_time, GstClockTime output_end_time,
GstBuffer ** outbuf) GstClockTime output_start_running_time, GstBuffer ** outbuf)
{ {
GstAggregator *agg = GST_AGGREGATOR (vagg); GstAggregator *agg = GST_AGGREGATOR (vagg);
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
@ -1772,7 +1772,8 @@ gst_video_aggregator_do_aggregate (GstVideoAggregator * vagg,
&out_stream_time); &out_stream_time);
/* 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_aggregator_selected_samples (agg, GST_BUFFER_PTS (*outbuf),
GST_BUFFER_DTS (*outbuf), GST_BUFFER_DURATION (*outbuf));
/* 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);
@ -1953,7 +1954,7 @@ gst_video_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
jitter = gst_video_aggregator_do_qos (vagg, output_start_time); jitter = gst_video_aggregator_do_qos (vagg, output_start_time);
if (jitter <= 0) { if (jitter <= 0) {
flow_ret = gst_video_aggregator_do_aggregate (vagg, output_start_time, flow_ret = gst_video_aggregator_do_aggregate (vagg, output_start_time,
output_end_time, &outbuf); output_end_time, output_start_running_time, &outbuf);
if (flow_ret != GST_FLOW_OK) if (flow_ret != GST_FLOW_OK)
goto done; goto done;
vagg->priv->qos_processed++; vagg->priv->qos_processed++;

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

@ -2169,7 +2169,8 @@ GST_END_TEST;
static GstBuffer *expected_selected_buffer = NULL; static GstBuffer *expected_selected_buffer = NULL;
static void static void
samples_selected_cb (GstAggregator * agg, gint * called) samples_selected_cb (GstAggregator * agg, GstSegment * segment,
GstClockTime pts, GstClockTime dts, GstClockTime duration, gint * called)
{ {
GstPad *pad; GstPad *pad;
GstSample *sample; GstSample *sample;

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

@ -61,9 +61,13 @@ check_aggregated_buffer (GstElement * agg, GstPad * pad,
} }
static void static void
samples_selected_cb (GstElement * agg, GHashTable * consumed_buffers) samples_selected_cb (GstElement * agg, GstSegment * segment, GstClockTime pts,
GstClockTime dts, GstClockTime duration, GHashTable * consumed_buffers)
{ {
gst_printerr ("Compositor has selected the samples it will aggregate\n"); gst_printerr
("Compositor has selected the samples it will aggregate for output buffer with PTS %"
GST_TIME_FORMAT " and duration %" GST_TIME_FORMAT "\n",
GST_TIME_ARGS (pts), GST_TIME_ARGS (duration));
gst_element_foreach_sink_pad (agg, gst_element_foreach_sink_pad (agg,
(GstElementForeachPadFunc) check_aggregated_buffer, consumed_buffers); (GstElementForeachPadFunc) check_aggregated_buffer, consumed_buffers);
} }