From: Edward Hervey <edward@centricular.com>
Date: Thu, 19 Nov 2020 09:49:01 +0000 (+0100)
Subject: decodebin3: Make input activation "atomic"
X-Git-Tag: 1.19.3~511^2~208
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e15531bb9b1e320d7892117b76cb7d5e7afcd32e;p=platform%2Fupstream%2Fgstreamer.git

decodebin3: Make input activation "atomic"

When adding inputs dynamically, we need to make sure the new parsebin are
added *and* activated by the same thread (by taking the state change lock).

The rationale for this is that the calling thread might be an upstream streaming
thread and when activating parsebin it might call back upstream. If we don't use
the same thread (ex: when the application does a state change on decodebin3
between the moment we add parsebin to decodebin3 and we synchronize the state of
parsebin) then we would end up in different threads trying to take upstream
recursive locks.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/932>
---

diff --git a/gst/playback/gstdecodebin3.c b/gst/playback/gstdecodebin3.c
index 423863d..48d2c84 100644
--- a/gst/playback/gstdecodebin3.c
+++ b/gst/playback/gstdecodebin3.c
@@ -812,14 +812,22 @@ ensure_input_parsebin (GstDecodebin3 * dbin, DecodebinInput * input)
   }
 
   if (GST_OBJECT_PARENT (GST_OBJECT (input->parsebin)) != GST_OBJECT (dbin)) {
+    /* The state lock is taken so that we ensure we are the one (de)activating
+     * parsebin. We need to do this to ensure any activation taking place in
+     * parsebin (including by elements doing upstream activation) are done
+     * within the same thread. */
+    GST_STATE_LOCK (input->parsebin);
     gst_bin_add (GST_BIN (dbin), input->parsebin);
     set_state = TRUE;
   }
 
   gst_ghost_pad_set_target (GST_GHOST_PAD (input->ghost_sink),
       input->parsebin_sink);
-  if (set_state)
+
+  if (set_state) {
     gst_element_sync_state_with_parent (input->parsebin);
+    GST_STATE_UNLOCK (input->parsebin);
+  }
 
   return TRUE;