Changeset 224012 in webkit

Timestamp:

Oct 26, 2017 3:31:39 AM (6 years ago)

Author:

eocanha@igalia.com

Message:

[MSE][GStreamer] Fix hang on clearing/destroying AppendPipeline
​https://bugs.webkit.org/show_bug.cgi?id=178819

Reviewed by Xabier Rodriguez-Calvar.

The deadlock may occur when UI thread tries to clear pipeline in
AppendPipeline::clearPlayerPrivate() while parser thread tries to change
pipeline state to pause holding the stream lock in
AppendPipeline::connectDemuxerSrcPadToAppsinkFromAnyThread()

This patch is authored by Eugene Mutavchi <​Ievgen_Mutavchi@comcast.com>

• platform/graphics/gstreamer/mse/AppendPipeline.cpp:

(WebCore::AppendPipeline::connectDemuxerSrcPadToAppsinkFromAnyThread):
Return if there's no player private.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/mse/AppendPipeline.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-26  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [MSE][GStreamer] Fix hang on clearing/destroying AppendPipeline
+        https://bugs.webkit.org/show_bug.cgi?id=178819
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        The deadlock may occur when UI thread tries to clear pipeline in
+        AppendPipeline::clearPlayerPrivate() while parser thread tries to change
+        pipeline state to pause holding the stream lock in
+        AppendPipeline::connectDemuxerSrcPadToAppsinkFromAnyThread()
+
+        This patch is authored by Eugene Mutavchi <Ievgen_Mutavchi@comcast.com>
+
+        * platform/graphics/gstreamer/mse/AppendPipeline.cpp:
+        (WebCore::AppendPipeline::connectDemuxerSrcPadToAppsinkFromAnyThread):
+        Return if there's no player private.
+
 2017-10-26  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp

@@ -1014 +1014 @@
 
         m_padAddRemoveCondition.wait(m_padAddRemoveLock);
+
+        if (!m_playerPrivate)
+            return;
     }