Changeset 277432 in webkit

Timestamp:

May 13, 2021, 6:54:43 AM (5 years ago)

Author:

eocanha@igalia.com

Message:

[GStreamer] media/track/in-band/track-in-band-srt-mkv-kind.html is a flaky crash
​https://bugs.webkit.org/show_bug.cgi?id=225697

Source/WebCore:

This is a tentative fix for the flaky crash (I can't reproduce it locally after 10000
repetitions). It makes sure that mediaPlayerPrivate and any parameter passed to
handleTextSample() can either survive or detected to be invalid when the lambda is ran in
the main thread.

Reviewed by Alicia Boya Garcia.

Covered by existing tests.

• platform/graphics/gstreamer/TextSinkGStreamer.cpp:

(webkitTextSinkHandleSample): Protect mediaPlayerPrivate and streadId and check if the mediaPlayerPrivate WeakRef is still alive.

LayoutTests:

Reviewed by Alicia Boya Garcia.

• platform/glib/TestExpectations: Unskipped test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/glib/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/TextSinkGStreamer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-05-13  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [GStreamer] media/track/in-band/track-in-band-srt-mkv-kind.html is a flaky crash
+        https://bugs.webkit.org/show_bug.cgi?id=225697
+
+        Reviewed by Alicia Boya Garcia.
+
+        * platform/glib/TestExpectations: Unskipped test.
+
 2021-05-13  Martin Robinson  <mrobinson@webkit.org>
 

trunk/LayoutTests/platform/glib/TestExpectations

@@ -2382 +2382 @@
 webkit.org/b/225499 imported/w3c/web-platform-tests/css/css-fonts/font-feature-resolution-002.html [ ImageOnlyFailure ]
 
-webkit.org/b/225697 media/track/in-band/track-in-band-srt-mkv-kind.html [ Crash Pass ]
-
 # End: Common failures between GTK and WPE.
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-13  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [GStreamer] media/track/in-band/track-in-band-srt-mkv-kind.html is a flaky crash
+        https://bugs.webkit.org/show_bug.cgi?id=225697
+
+        This is a tentative fix for the flaky crash (I can't reproduce it locally after 10000
+        repetitions). It makes sure that mediaPlayerPrivate and any parameter passed to
+        handleTextSample() can either survive or detected to be invalid when the lambda is ran in
+        the main thread.
+
+        Reviewed by Alicia Boya Garcia.
+
+        Covered by existing tests.
+
+        * platform/graphics/gstreamer/TextSinkGStreamer.cpp:
+        (webkitTextSinkHandleSample): Protect mediaPlayerPrivate and streadId and check if the mediaPlayerPrivate WeakRef is still alive.
+
 2021-05-12  Frederic Wang  <fwang@igalia.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/TextSinkGStreamer.cpp

@@ -62 +62 @@
 
     if (priv->streamId) {
-        // As the mediaPlayerPrivate WeakPtr is constructed from the main thread, we have to use it
-        // from the main thread as well.
-        callOnMainThread([priv, sample = WTFMove(sample)] {
-            priv->mediaPlayerPrivate->handleTextSample(sample.get(), priv->streamId);
+        // Player private methods that interact with WebCore must run from the main thread. Things can be destroyed before that
+        // code runs, including the text sink and priv, so pass everything in a safe way.
+        callOnMainThread([mediaPlayerPrivate = WeakPtr<MediaPlayerPrivateGStreamer>(priv->mediaPlayerPrivate),
+            streamId = priv->streamId, sample = WTFMove(sample)] {
+            if (!mediaPlayerPrivate)
+                return;
+            mediaPlayerPrivate->handleTextSample(sample.get(), streamId);
         });
         return;