From: Sebastian Dröge <sebastian@centricular.com>
Date: Tue, 31 May 2016 09:09:44 +0000 (+0300)
Subject: nlecomposition: Fix race condition in seek handling causing deadlocks
X-Git-Tag: 1.19.3~493^2~999
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ef72b72767d10512d66b3882a48626ae0497190;p=platform%2Fupstream%2Fgstreamer.git

nlecomposition: Fix race condition in seek handling causing deadlocks

We might receive another seek from the application while the action task is
handling a previous seek (and thus setting seeking_itself to TRUE). To prevent
this seek to go through directly instead of being added as an action, also
check if the seek event was received from our action task thread or some other
thread.

https://bugzilla.gnome.org/show_bug.cgi?id=767053
---

diff --git a/plugins/nle/nlecomposition.c b/plugins/nle/nlecomposition.c
index f5856dcd08..cc138ca3ef 100644
--- a/plugins/nle/nlecomposition.c
+++ b/plugins/nle/nlecomposition.c
@@ -1558,13 +1558,23 @@ nle_composition_event_handler (GstPad * ghostpad, GstObject * parent,
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_SEEK:
     {
-      if (!priv->seeking_itself) {
+      /* Queue up a seek action if this seek event does not come from
+       * ourselves. Due to a possible race condition around the
+       * seeking_itself flag, we also check if the seek comes from
+       * our task thread. The seeking_itself flag only works as an
+       * optimization */
+      GST_OBJECT_LOCK (comp);
+      if (!priv->seeking_itself || (comp->task
+              && gst_task_get_state (comp->task) != GST_TASK_STOPPED
+              && g_thread_self () != comp->task->thread)) {
+        GST_OBJECT_UNLOCK (comp);
         _add_seek_action (comp, event);
         event = NULL;
         GST_FIXME_OBJECT (comp, "HANDLE seeking errors!");
 
         return TRUE;
       }
+      GST_OBJECT_UNLOCK (comp);
       break;
     }
     case GST_EVENT_QOS: