basesrc: Use an atomic integer instead of a lock for checking tags presence

https://bugzilla.gnome.org/show_bug.cgi?id=636455
This commit is contained in:
Edward Hervey 2010-12-04 15:32:06 +01:00 committed by Edward Hervey
parent 0a74684b41
commit 5372e81c9a

View file

@ -240,6 +240,7 @@ struct _GstBaseSrcPrivate
/* pending tags to be pushed in the data stream */ /* pending tags to be pushed in the data stream */
GList *pending_tags; GList *pending_tags;
volatile gint have_tags;
/* QoS *//* with LOCK */ /* QoS *//* with LOCK */
gboolean qos_enabled; gboolean qos_enabled;
@ -436,6 +437,7 @@ gst_base_src_init (GstBaseSrc * basesrc, gpointer g_class)
gst_base_src_set_format (basesrc, GST_FORMAT_BYTES); gst_base_src_set_format (basesrc, GST_FORMAT_BYTES);
basesrc->data.ABI.typefind = DEFAULT_TYPEFIND; basesrc->data.ABI.typefind = DEFAULT_TYPEFIND;
basesrc->priv->do_timestamp = DEFAULT_DO_TIMESTAMP; basesrc->priv->do_timestamp = DEFAULT_DO_TIMESTAMP;
g_atomic_int_set (&basesrc->priv->have_tags, FALSE);
GST_OBJECT_FLAG_UNSET (basesrc, GST_BASE_SRC_STARTED); GST_OBJECT_FLAG_UNSET (basesrc, GST_BASE_SRC_STARTED);
GST_OBJECT_FLAG_SET (basesrc, GST_ELEMENT_IS_SOURCE); GST_OBJECT_FLAG_SET (basesrc, GST_ELEMENT_IS_SOURCE);
@ -1582,6 +1584,7 @@ gst_base_src_send_event (GstElement * element, GstEvent * event)
/* Insert tag in the dataflow */ /* Insert tag in the dataflow */
GST_OBJECT_LOCK (src); GST_OBJECT_LOCK (src);
src->priv->pending_tags = g_list_append (src->priv->pending_tags, event); src->priv->pending_tags = g_list_append (src->priv->pending_tags, event);
g_atomic_int_set (&src->priv->have_tags, TRUE);
GST_OBJECT_UNLOCK (src); GST_OBJECT_UNLOCK (src);
event = NULL; event = NULL;
result = TRUE; result = TRUE;
@ -2348,7 +2351,7 @@ gst_base_src_loop (GstPad * pad)
gint64 position; gint64 position;
gboolean eos; gboolean eos;
gulong blocksize; gulong blocksize;
GList *tags, *tmp; GList *tags = NULL, *tmp;
eos = FALSE; eos = FALSE;
@ -2405,11 +2408,14 @@ gst_base_src_loop (GstPad * pad)
} }
src->priv->newsegment_pending = FALSE; src->priv->newsegment_pending = FALSE;
GST_OBJECT_LOCK (src); if (g_atomic_int_get (&src->priv->have_tags)) {
/* take the tags */ GST_OBJECT_LOCK (src);
tags = src->priv->pending_tags; /* take the tags */
src->priv->pending_tags = NULL; tags = src->priv->pending_tags;
GST_OBJECT_UNLOCK (src); src->priv->pending_tags = NULL;
g_atomic_int_set (&src->priv->have_tags, FALSE);
GST_OBJECT_UNLOCK (src);
}
/* Push out pending tags if any */ /* Push out pending tags if any */
if (G_UNLIKELY (tags != NULL)) { if (G_UNLIKELY (tags != NULL)) {