mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-02 10:13:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: Hold object lock while manipulating the segment

Browse source 
Make sure the object lock is held when aggregator->segment is
modified.
This commit is contained in:
Olivier Crête 2015-11-02 20:10:35 -05:00 committed by Tim-Philipp Müller
parent b95f3e8455
commit dc346ca245
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2157,6 +2157,7 @@ gst_aggregator_pad_chain_internal (GstAggregator * self,
for (;;) { for (;;) {
SRC_LOCK (self); SRC_LOCK (self);
GST_OBJECT_LOCK (self);
PAD_LOCK (aggpad); PAD_LOCK (aggpad);
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) {
@ -2173,10 +2174,12 @@ gst_aggregator_pad_chain_internal (GstAggregator * self,
flow_return = aggpad->priv->flow_return; flow_return = aggpad->priv->flow_return;
if (flow_return != GST_FLOW_OK) { if (flow_return != GST_FLOW_OK) {
GST_OBJECT_UNLOCK (self);
SRC_UNLOCK (self); SRC_UNLOCK (self);
goto flushing; goto flushing;
} }
GST_DEBUG_OBJECT (aggpad, "Waiting for buffer to be consumed"); GST_DEBUG_OBJECT (aggpad, "Waiting for buffer to be consumed");
GST_OBJECT_UNLOCK (self);
SRC_UNLOCK (self); SRC_UNLOCK (self);
PAD_WAIT_EVENT (aggpad); PAD_WAIT_EVENT (aggpad);
@ -2192,6 +2195,7 @@ gst_aggregator_pad_chain_internal (GstAggregator * self,
start_time = 0; start_time = 0;
break; break;
case GST_AGGREGATOR_START_TIME_SELECTION_FIRST: case GST_AGGREGATOR_START_TIME_SELECTION_FIRST:
GST_OBJECT_LOCK (aggpad);
if (aggpad->segment.format == GST_FORMAT_TIME) { if (aggpad->segment.format == GST_FORMAT_TIME) {
start_time = buf_pts; start_time = buf_pts;
if (start_time != -1) { if (start_time != -1) {
@ -2207,6 +2211,7 @@ gst_aggregator_pad_chain_internal (GstAggregator * self,
"as the segment is a %s segment instead of a time segment", "as the segment is a %s segment instead of a time segment",
gst_format_get_name (aggpad->segment.format)); gst_format_get_name (aggpad->segment.format));
} }
GST_OBJECT_UNLOCK (aggpad);
break; break;
case GST_AGGREGATOR_START_TIME_SELECTION_SET: case GST_AGGREGATOR_START_TIME_SELECTION_SET:
start_time = self->priv->start_time; start_time = self->priv->start_time;
@ -2227,6 +2232,7 @@ gst_aggregator_pad_chain_internal (GstAggregator * self,
} }
PAD_UNLOCK (aggpad); PAD_UNLOCK (aggpad);
GST_OBJECT_UNLOCK (self);
SRC_UNLOCK (self); SRC_UNLOCK (self);
done: done: