Attachment 340601 Details for Bug 185723 – Patch

[patch] Patch

bug-185723-20180517195544.patch (text/plain), 2.20 KB, created by Yacine Bandou on 2018-05-17 10:55:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yacine Bandou

Created: 2018-05-17 10:55:42 PDT

Size: 2.20 KB

patch

obsolete

>Subversion Revision: 231637
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 86c5e969b8b10af1827c38443681bcee346f3745..afa5f54d231c1bc283f61037e3bdf19dca7aa8b5 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-17  Yacine Bandou  <yacine.bandou_ext@softathome.com>
>+
>+        [MSE][GStreamer] Fix the deadlock caused by bug 185242 (r231351)
>+        https://bugs.webkit.org/show_bug.cgi?id=185723
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        After a detailed investigation, we found that, the patch r231351 doesn't fix the crash that expected to fix,
>+        it just replaces it by a deadlock. Now the crash is fixed in the bug 185725.
>+
>+        This Patch will remove a part of r231351 that causes the deadlock.
>+
>+        * platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:
>+        (webKitMediaSrcFreeStream):
>+
> 2018-05-17  Yacine Bandou  <yacine.bandou_ext@softathome.com>
> 
>         [MSE][GStreamer] Don't set the ReadyState to HaveNothing when an error occurs in the playback pipeline
>diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp
>index bb14f2bce8cdedf6be86726d23209ace0b99cf05..48d09ed206bde9c35e3090ed2b112002bf3309a2 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp
>@@ -513,15 +513,6 @@ void webKitMediaSrcFreeStream(WebKitMediaSrc* source, Stream* stream)
>         // Don't trigger callbacks from this appsrc to avoid using the stream anymore.
>         gst_app_src_set_callbacks(GST_APP_SRC(stream->appsrc), &disabledAppsrcCallbacks, nullptr, nullptr);
>         gst_app_src_end_of_stream(GST_APP_SRC(stream->appsrc));
>-        gst_element_set_state(stream->appsrc, GST_STATE_NULL);
>-        gst_bin_remove(GST_BIN(source), stream->appsrc);
>-        stream->appsrc = nullptr;
>-    }
>-
>-    if (stream->parser) {
>-        gst_element_set_state(stream->parser, GST_STATE_NULL);
>-        gst_bin_remove(GST_BIN(source), stream->parser);
>-        stream->parser = nullptr;
>     }
> 
>     GST_OBJECT_LOCK(source);

Actions: View | Formatted Diff | Diff

Attachments on bug 185723: 340601