From b3c4b8d1dfa59d2318ff834a111f7f0854f56e87 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 12 Dec 2014 11:21:27 +0100 Subject: [PATCH] watchdog: GstElement->state is protected with the OBJECT_LOCK Not the STATE_LOCK. gst_watchdog_feed was already always called with the OBJECT_LOCK taken. --- gst/debugutils/gstwatchdog.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gst/debugutils/gstwatchdog.c b/gst/debugutils/gstwatchdog.c index fe48448ad7..3292b43611 100644 --- a/gst/debugutils/gstwatchdog.c +++ b/gst/debugutils/gstwatchdog.c @@ -207,6 +207,7 @@ gst_watchdog_quit_mainloop (gpointer ptr) return FALSE; } +/* Call with OBJECT_LOCK taken */ static void gst_watchdog_feed (GstWatchdog * watchdog, gpointer mini_object, gboolean force) { @@ -243,8 +244,6 @@ gst_watchdog_feed (GstWatchdog * watchdog, gpointer mini_object, gboolean force) } - GST_STATE_LOCK (watchdog); - if (watchdog->timeout == 0) { GST_LOG_OBJECT (watchdog, "Timeout is 0 => nothing to do"); } else if (watchdog->main_context == NULL) { @@ -258,7 +257,6 @@ gst_watchdog_feed (GstWatchdog * watchdog, gpointer mini_object, gboolean force) gst_object_ref (watchdog), gst_object_unref); g_source_attach (watchdog->source, watchdog->main_context); } - GST_STATE_UNLOCK (watchdog); } static gboolean