mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 23:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: Simplify clip function

Browse source 
The return value was ignored anyway

https://bugzilla.gnome.org/show_bug.cgi?id=781673
This commit is contained in:
Olivier Crête 2016-07-06 16:41:44 -04:00 committed by Tim-Philipp Müller
parent 8936a692c1
commit 2ab5a23a10
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libs/gst/base/gstaggregator.c
View file

@ -2141,7 +2141,6 @@ static GstFlowReturn
gst_aggregator_pad_chain_internal (GstAggregator * self, gst_aggregator_pad_chain_internal (GstAggregator * self,
GstAggregatorPad * aggpad, GstBuffer * buffer, gboolean head) GstAggregatorPad * aggpad, GstBuffer * buffer, gboolean head)
{ {
GstBuffer *actual_buf = buffer;
GstAggregatorClass *aggclass = GST_AGGREGATOR_GET_CLASS (self); GstAggregatorClass *aggclass = GST_AGGREGATOR_GET_CLASS (self);
GstFlowReturn flow_return; GstFlowReturn flow_return;
GstClockTime buf_pts; GstClockTime buf_pts;
@ -2161,15 +2160,15 @@ gst_aggregator_pad_chain_internal (GstAggregator * self,
PAD_UNLOCK (aggpad); PAD_UNLOCK (aggpad);
if (aggclass->clip && head) { if (aggclass->clip && head) {
aggclass->clip (self, aggpad, buffer, &actual_buf); buffer = aggclass->clip (self, aggpad, buffer);
} }
if (actual_buf == NULL) { if (buffer == NULL) {
GST_LOG_OBJECT (actual_buf, "Buffer dropped by clip function"); GST_LOG_OBJECT (aggpad, "Buffer dropped by clip function");
goto done; goto done;
} }
buf_pts = GST_BUFFER_PTS (actual_buf); buf_pts = GST_BUFFER_PTS (buffer);
aggpad->priv->first_buffer = FALSE; aggpad->priv->first_buffer = FALSE;
@ -2180,12 +2179,12 @@ gst_aggregator_pad_chain_internal (GstAggregator * self,
if (gst_aggregator_pad_has_space (self, aggpad) if (gst_aggregator_pad_has_space (self, aggpad)
&& aggpad->priv->flow_return == GST_FLOW_OK) { && aggpad->priv->flow_return == GST_FLOW_OK) {
if (head) if (head)
g_queue_push_head (&aggpad->priv->buffers, actual_buf); g_queue_push_head (&aggpad->priv->buffers, buffer);
else else
g_queue_push_tail (&aggpad->priv->buffers, actual_buf); g_queue_push_tail (&aggpad->priv->buffers, buffer);
apply_buffer (aggpad, actual_buf, head); apply_buffer (aggpad, buffer, head);
aggpad->priv->num_buffers++; aggpad->priv->num_buffers++;
actual_buf = buffer = NULL; buffer = NULL;
SRC_BROADCAST (self); SRC_BROADCAST (self);
break; break;
} }

15
libs/gst/base/gstaggregator.h
View file

@ -155,9 +155,13 @@ struct _GstAggregator
* stops have been received. Flush pad-specific data in * stops have been received. Flush pad-specific data in
* #GstAggregatorPad->flush. * #GstAggregatorPad->flush.
* @clip: Optional. * @clip: Optional.
* Called when a buffer is received on a sink pad, the task * Called when a buffer is received on a sink pad, the task of
* of clipping it and translating it to the current segment * clipping it and translating it to the current segment falls
* falls on the subclass. * on the subclass. The function should use the segment of data
* and the negotiated media type on the pad to perform
* clipping of inbuffer. This function takes ownership of
* buf and should output a buffer or return NULL in
* if the buffer should be dropped.
* @sink_event: Optional. * @sink_event: Optional.
* Called when an event is received on a sink pad, the subclass * Called when an event is received on a sink pad, the subclass
* should always chain up. * should always chain up.
@ -211,10 +215,9 @@ struct _GstAggregatorClass {
GstFlowReturn (*flush) (GstAggregator * aggregator); GstFlowReturn (*flush) (GstAggregator * aggregator);
GstFlowReturn (*clip) (GstAggregator * aggregator, GstBuffer * (*clip) (GstAggregator * aggregator,
GstAggregatorPad * aggregator_pad, GstAggregatorPad * aggregator_pad,
GstBuffer * buf, GstBuffer * buf);
GstBuffer ** outbuf);
/* sinkpads virtual methods */ /* sinkpads virtual methods */
gboolean (*sink_event) (GstAggregator * aggregator, gboolean (*sink_event) (GstAggregator * aggregator,