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

aggregator: Protect the tags with the object lock

Browse source 
The tags related variables were sometimes protected, sometimes not and
sometimes atomic. Put them all under the object lock.

https://bugzilla.gnome.org/show_bug.cgi?id=742684
This commit is contained in:
Olivier Crête 2015-01-21 19:33:18 -05:00 committed by Tim-Philipp Müller
parent 25faafaf58
commit 9add348012
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -231,6 +231,7 @@ struct _GstAggregatorPrivate
GstCaps *srccaps; GstCaps *srccaps;
/* protected by object lock */
GstTagList *tags; GstTagList *tags;
gboolean tags_changed; gboolean tags_changed;
@ -409,6 +410,8 @@ static inline void
gst_aggregator_push_mandatory_events (GstAggregator * self) gst_aggregator_push_mandatory_events (GstAggregator * self)
{ {
GstAggregatorPrivate *priv = self->priv; GstAggregatorPrivate *priv = self->priv;
GstEvent *segment = NULL;
GstEvent *tags = NULL;
if (self->priv->send_stream_start) { if (self->priv->send_stream_start) {
gchar s_id[32]; gchar s_id[32];
@ -436,26 +439,28 @@ gst_aggregator_push_mandatory_events (GstAggregator * self)
GST_OBJECT_LOCK (self); GST_OBJECT_LOCK (self);
if (self->priv->send_segment && !self->priv->flush_seeking) { if (self->priv->send_segment && !self->priv->flush_seeking) {
GstEvent *segev = gst_event_new_segment (&self->segment); segment = gst_event_new_segment (&self->segment);
if (!self->priv->seqnum) if (!self->priv->seqnum)
self->priv->seqnum = gst_event_get_seqnum (segev); self->priv->seqnum = gst_event_get_seqnum (segment);
else else
gst_event_set_seqnum (segev, self->priv->seqnum); gst_event_set_seqnum (segment, self->priv->seqnum);
self->priv->send_segment = FALSE; self->priv->send_segment = FALSE;
GST_OBJECT_UNLOCK (self);
GST_DEBUG_OBJECT (self, "pushing segment %" GST_PTR_FORMAT, segev); GST_DEBUG_OBJECT (self, "pushing segment %" GST_PTR_FORMAT, segment);
gst_pad_push_event (self->srcpad, segev);
} else {
GST_OBJECT_UNLOCK (self);
} }
if (priv->tags && priv->tags_changed) { if (priv->tags && priv->tags_changed) {
gst_pad_push_event (self->srcpad, tags = gst_event_new_tag (gst_tag_list_ref (priv->tags));
gst_event_new_tag (gst_tag_list_ref (priv->tags)));
priv->tags_changed = FALSE; priv->tags_changed = FALSE;
} }
GST_OBJECT_UNLOCK (self);
if (segment)
gst_pad_push_event (self->srcpad, segment);
if (tags)
gst_pad_push_event (self->srcpad, tags);
} }
/** /**
@ -740,7 +745,7 @@ gst_aggregator_flush (GstAggregator * self)
GST_OBJECT_LOCK (self); GST_OBJECT_LOCK (self);
priv->send_segment = TRUE; priv->send_segment = TRUE;
priv->flush_seeking = FALSE; priv->flush_seeking = FALSE;
g_atomic_int_set (&priv->tags_changed, FALSE); priv->tags_changed = FALSE;
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
if (klass->flush) if (klass->flush)
ret = klass->flush (self); ret = klass->flush (self);
@ -951,10 +956,6 @@ gst_aggregator_stop (GstAggregator * agg)
gst_aggregator_iterate_sinkpads (agg, gst_aggregator_stop_pad, NULL); gst_aggregator_iterate_sinkpads (agg, gst_aggregator_stop_pad, NULL);
if (agg->priv->tags)
gst_tag_list_unref (agg->priv->tags);
agg->priv->tags = NULL;
klass = GST_AGGREGATOR_GET_CLASS (agg); klass = GST_AGGREGATOR_GET_CLASS (agg);
if (klass->stop) if (klass->stop)
@ -962,6 +963,10 @@ gst_aggregator_stop (GstAggregator * agg)
else else
result = TRUE; result = TRUE;
if (agg->priv->tags)
gst_tag_list_unref (agg->priv->tags);
agg->priv->tags = NULL;
return result; return result;
} }