mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 04:45:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: use new gst_aggregator_pad_drop_buffer()

Browse source
This commit is contained in:
Tim-Philipp Müller 2015-02-13 16:03:53 +00:00
parent 0d510b2da9
commit 8b87f3f2fe
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -993,8 +993,7 @@ gst_videoaggregator_fill_queues (GstVideoAggregator * vagg,
|| (pad->buffer && start_time < GST_BUFFER_TIMESTAMP (pad->buffer))) { || (pad->buffer && start_time < GST_BUFFER_TIMESTAMP (pad->buffer))) {
GST_DEBUG_OBJECT (pad, "Buffer from the past, dropping"); GST_DEBUG_OBJECT (pad, "Buffer from the past, dropping");
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = gst_aggregator_pad_steal_buffer (bpad); gst_aggregator_pad_drop_buffer (bpad);
gst_buffer_unref (buf);
need_more_data = TRUE; need_more_data = TRUE;
continue; continue;
} }
@ -1016,8 +1015,7 @@ gst_videoaggregator_fill_queues (GstVideoAggregator * vagg,
"output_start_time. Discarding old buffer"); "output_start_time. Discarding old buffer");
gst_buffer_replace (&pad->buffer, buf); gst_buffer_replace (&pad->buffer, buf);
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = gst_aggregator_pad_steal_buffer (bpad); gst_aggregator_pad_drop_buffer (bpad);
gst_buffer_unref (buf);
need_more_data = TRUE; need_more_data = TRUE;
continue; continue;
} }
@ -1044,8 +1042,7 @@ gst_videoaggregator_fill_queues (GstVideoAggregator * vagg,
GST_TIME_ARGS (end_time)); GST_TIME_ARGS (end_time));
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = gst_aggregator_pad_steal_buffer (bpad); gst_aggregator_pad_drop_buffer (bpad);
gst_buffer_unref (buf);
need_more_data = TRUE; need_more_data = TRUE;
continue; continue;
@ -1076,8 +1073,7 @@ gst_videoaggregator_fill_queues (GstVideoAggregator * vagg,
if (pad->priv->end_time != -1 && pad->priv->end_time > end_time) { if (pad->priv->end_time != -1 && pad->priv->end_time > end_time) {
GST_DEBUG_OBJECT (pad, "Buffer from the past, dropping"); GST_DEBUG_OBJECT (pad, "Buffer from the past, dropping");
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = gst_aggregator_pad_steal_buffer (bpad); gst_aggregator_pad_drop_buffer (bpad);
gst_buffer_unref (buf);
continue; continue;
} }
@ -1091,9 +1087,7 @@ gst_videoaggregator_fill_queues (GstVideoAggregator * vagg,
pad->priv->end_time = end_time; pad->priv->end_time = end_time;
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = gst_aggregator_pad_steal_buffer (bpad); gst_aggregator_pad_drop_buffer (bpad);
if (buf)
gst_buffer_unref (buf);
eos = FALSE; eos = FALSE;
} else if (start_time >= output_end_time) { } else if (start_time >= output_end_time) {
GST_DEBUG_OBJECT (pad, "Keeping buffer until %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (pad, "Keeping buffer until %" GST_TIME_FORMAT,
@ -1110,9 +1104,7 @@ gst_videoaggregator_fill_queues (GstVideoAggregator * vagg,
" out end %" GST_TIME_FORMAT, GST_TIME_ARGS (start_time), " out end %" GST_TIME_FORMAT, GST_TIME_ARGS (start_time),
GST_TIME_ARGS (output_end_time)); GST_TIME_ARGS (output_end_time));
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = gst_aggregator_pad_steal_buffer (bpad); gst_aggregator_pad_drop_buffer (bpad);
if (buf)
gst_buffer_unref (buf);
need_more_data = TRUE; need_more_data = TRUE;
continue; continue;