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

gst/elements/gstidentity.c: Protect last_message property as it is accessed from multiple threads.

Browse source 
Original commit message from CVS:
* gst/elements/gstidentity.c: (gst_identity_event),
(gst_identity_transform), (gst_identity_get_property):
Protect last_message property as it is accessed from
multiple threads.
This commit is contained in:
Wim Taymans 2005-05-30 16:28:41 +00:00
parent 8d0a4e1d4f
commit fcc76e3d07
3 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-05-30 Wim Taymans <wim@fluendo.com>
* gst/elements/gstidentity.c: (gst_identity_event),
(gst_identity_transform), (gst_identity_get_property):
Protect last_message property as it is accessed from
multiple threads.
2005-05-30 Wim Taymans <wim@fluendo.com> 2005-05-30 Wim Taymans <wim@fluendo.com>
* gst/gstelement.c: (gst_element_init), * gst/gstelement.c: (gst_element_init),

8
gst/elements/gstidentity.c
View file

@ -215,11 +215,13 @@ gst_identity_event (GstBaseTransform * trans, GstEvent * event)
identity = GST_IDENTITY (trans); identity = GST_IDENTITY (trans);
if (!identity->silent) { if (!identity->silent) {
GST_LOCK (identity);
g_free (identity->last_message); g_free (identity->last_message);
identity->last_message = identity->last_message =
g_strdup_printf ("chain ******* (%s:%s)E (type: %d) %p", g_strdup_printf ("chain ******* (%s:%s)E (type: %d) %p",
GST_DEBUG_PAD_NAME (trans->sinkpad), GST_EVENT_TYPE (event), event); GST_DEBUG_PAD_NAME (trans->sinkpad), GST_EVENT_TYPE (event), event);
GST_UNLOCK (identity);
g_object_notify (G_OBJECT (identity), "last_message"); g_object_notify (G_OBJECT (identity), "last_message");
} }
@ -285,6 +287,7 @@ gst_identity_transform (GstBaseTransform * trans, GstBuffer * inbuf,
if (identity->drop_probability > 0.0) { if (identity->drop_probability > 0.0) {
if ((gfloat) (1.0 * rand () / (RAND_MAX)) < identity->drop_probability) { if ((gfloat) (1.0 * rand () / (RAND_MAX)) < identity->drop_probability) {
GST_LOCK (identity);
g_free (identity->last_message); g_free (identity->last_message);
identity->last_message = identity->last_message =
g_strdup_printf ("dropping ******* (%s:%s)i (%d bytes, timestamp: %" g_strdup_printf ("dropping ******* (%s:%s)i (%d bytes, timestamp: %"
@ -295,6 +298,7 @@ gst_identity_transform (GstBaseTransform * trans, GstBuffer * inbuf,
GST_TIME_ARGS (GST_BUFFER_DURATION (inbuf)), GST_TIME_ARGS (GST_BUFFER_DURATION (inbuf)),
GST_BUFFER_OFFSET (inbuf), GST_BUFFER_OFFSET_END (inbuf), GST_BUFFER_OFFSET (inbuf), GST_BUFFER_OFFSET_END (inbuf),
GST_BUFFER_FLAGS (inbuf), inbuf); GST_BUFFER_FLAGS (inbuf), inbuf);
GST_UNLOCK (identity);
g_object_notify (G_OBJECT (identity), "last-message"); g_object_notify (G_OBJECT (identity), "last-message");
return GST_FLOW_OK; return GST_FLOW_OK;
} }
@ -308,6 +312,7 @@ gst_identity_transform (GstBaseTransform * trans, GstBuffer * inbuf,
GstClockTime time; GstClockTime time;
if (!identity->silent) { if (!identity->silent) {
GST_LOCK (identity);
g_free (identity->last_message); g_free (identity->last_message);
identity->last_message = identity->last_message =
g_strdup_printf ("chain ******* (%s:%s)i (%d bytes, timestamp: %" g_strdup_printf ("chain ******* (%s:%s)i (%d bytes, timestamp: %"
@ -318,6 +323,7 @@ gst_identity_transform (GstBaseTransform * trans, GstBuffer * inbuf,
GST_TIME_ARGS (GST_BUFFER_DURATION (inbuf)), GST_TIME_ARGS (GST_BUFFER_DURATION (inbuf)),
GST_BUFFER_OFFSET (inbuf), GST_BUFFER_OFFSET_END (inbuf), GST_BUFFER_OFFSET (inbuf), GST_BUFFER_OFFSET_END (inbuf),
GST_BUFFER_FLAGS (inbuf), inbuf); GST_BUFFER_FLAGS (inbuf), inbuf);
GST_UNLOCK (identity);
g_object_notify (G_OBJECT (identity), "last-message"); g_object_notify (G_OBJECT (identity), "last-message");
} }
@ -428,7 +434,9 @@ gst_identity_get_property (GObject * object, guint prop_id, GValue * value,
g_value_set_boolean (value, identity->dump); g_value_set_boolean (value, identity->dump);
break; break;
case PROP_LAST_MESSAGE: case PROP_LAST_MESSAGE:
GST_LOCK (identity);
g_value_set_string (value, identity->last_message); g_value_set_string (value, identity->last_message);
GST_UNLOCK (identity);
break; break;
case PROP_SYNC: case PROP_SYNC:
g_value_set_boolean (value, identity->sync); g_value_set_boolean (value, identity->sync);

8
plugins/elements/gstidentity.c
View file

@ -215,11 +215,13 @@ gst_identity_event (GstBaseTransform * trans, GstEvent * event)
identity = GST_IDENTITY (trans); identity = GST_IDENTITY (trans);
if (!identity->silent) { if (!identity->silent) {
GST_LOCK (identity);
g_free (identity->last_message); g_free (identity->last_message);
identity->last_message = identity->last_message =
g_strdup_printf ("chain ******* (%s:%s)E (type: %d) %p", g_strdup_printf ("chain ******* (%s:%s)E (type: %d) %p",
GST_DEBUG_PAD_NAME (trans->sinkpad), GST_EVENT_TYPE (event), event); GST_DEBUG_PAD_NAME (trans->sinkpad), GST_EVENT_TYPE (event), event);
GST_UNLOCK (identity);
g_object_notify (G_OBJECT (identity), "last_message"); g_object_notify (G_OBJECT (identity), "last_message");
} }
@ -285,6 +287,7 @@ gst_identity_transform (GstBaseTransform * trans, GstBuffer * inbuf,
if (identity->drop_probability > 0.0) { if (identity->drop_probability > 0.0) {
if ((gfloat) (1.0 * rand () / (RAND_MAX)) < identity->drop_probability) { if ((gfloat) (1.0 * rand () / (RAND_MAX)) < identity->drop_probability) {
GST_LOCK (identity);
g_free (identity->last_message); g_free (identity->last_message);
identity->last_message = identity->last_message =
g_strdup_printf ("dropping ******* (%s:%s)i (%d bytes, timestamp: %" g_strdup_printf ("dropping ******* (%s:%s)i (%d bytes, timestamp: %"
@ -295,6 +298,7 @@ gst_identity_transform (GstBaseTransform * trans, GstBuffer * inbuf,
GST_TIME_ARGS (GST_BUFFER_DURATION (inbuf)), GST_TIME_ARGS (GST_BUFFER_DURATION (inbuf)),
GST_BUFFER_OFFSET (inbuf), GST_BUFFER_OFFSET_END (inbuf), GST_BUFFER_OFFSET (inbuf), GST_BUFFER_OFFSET_END (inbuf),
GST_BUFFER_FLAGS (inbuf), inbuf); GST_BUFFER_FLAGS (inbuf), inbuf);
GST_UNLOCK (identity);
g_object_notify (G_OBJECT (identity), "last-message"); g_object_notify (G_OBJECT (identity), "last-message");
return GST_FLOW_OK; return GST_FLOW_OK;
} }
@ -308,6 +312,7 @@ gst_identity_transform (GstBaseTransform * trans, GstBuffer * inbuf,
GstClockTime time; GstClockTime time;
if (!identity->silent) { if (!identity->silent) {
GST_LOCK (identity);
g_free (identity->last_message); g_free (identity->last_message);
identity->last_message = identity->last_message =
g_strdup_printf ("chain ******* (%s:%s)i (%d bytes, timestamp: %" g_strdup_printf ("chain ******* (%s:%s)i (%d bytes, timestamp: %"
@ -318,6 +323,7 @@ gst_identity_transform (GstBaseTransform * trans, GstBuffer * inbuf,
GST_TIME_ARGS (GST_BUFFER_DURATION (inbuf)), GST_TIME_ARGS (GST_BUFFER_DURATION (inbuf)),
GST_BUFFER_OFFSET (inbuf), GST_BUFFER_OFFSET_END (inbuf), GST_BUFFER_OFFSET (inbuf), GST_BUFFER_OFFSET_END (inbuf),
GST_BUFFER_FLAGS (inbuf), inbuf); GST_BUFFER_FLAGS (inbuf), inbuf);
GST_UNLOCK (identity);
g_object_notify (G_OBJECT (identity), "last-message"); g_object_notify (G_OBJECT (identity), "last-message");
} }
@ -428,7 +434,9 @@ gst_identity_get_property (GObject * object, guint prop_id, GValue * value,
g_value_set_boolean (value, identity->dump); g_value_set_boolean (value, identity->dump);
break; break;
case PROP_LAST_MESSAGE: case PROP_LAST_MESSAGE:
GST_LOCK (identity);
g_value_set_string (value, identity->last_message); g_value_set_string (value, identity->last_message);
GST_UNLOCK (identity);
break; break;
case PROP_SYNC: case PROP_SYNC:
g_value_set_boolean (value, identity->sync); g_value_set_boolean (value, identity->sync);