Attachment 339501 Details for Bug 185244 – Patch

[patch] Patch

bug-185244-20180504034249.patch (text/plain), 3.45 KB, created by Yacine Bandou on 2018-05-03 18:42:50 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yacine Bandou

Created: 2018-05-03 18:42:50 PDT

Size: 3.45 KB

patch

obsolete

>Subversion Revision: 231044
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ff279fafc2e6a05b1cd5cc56da27268dae7fb80b..a62ab266a5e53c3de48a8b8f33c4f4489b368022 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,5 +1,25 @@
> 2018-05-03  Yacine Bandou  <yacine.bandou_ext@softathome.com>
> 
>+        [EME][GStreamer] Crash when the mediaKeys created before loading the media in debug conf
>+        https://bugs.webkit.org/show_bug.cgi?id=185244
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The function "MediaPlayerPrivateGStreamerBase::cdmInstanceAttached" is expected to be called once,
>+        so there is an ASSERT(!m_cdmInstance).
>+        But when the MediaKeys created before loading the media, the cdminstance is created and attached
>+        to the MediaPlayerPrivate via "MediaPlayerPrivateGStreamerBase::cdmInstanceAttached" before laoding
>+        the media, then when the media is loading, the function "MediaPlayerPrivateGStreamerBase::cdmInstanceAttached"
>+        will be called several times via the function "mediaEngineWasUpdated" wich is called for each change
>+        in the MediaElement state, thus the WebProcess crashes in the ASSERT(!m_cdmInstance).
>+
>+        This commit avoid the crash by replacing the assert with a simple check.
>+
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
>+        (WebCore::MediaPlayerPrivateGStreamerBase::cdmInstanceAttached):
>+        (WebCore::MediaPlayerPrivateGStreamerBase::cdmInstanceDetached):
>+2018-05-03  Yacine Bandou  <yacine.bandou_ext@softathome.com>
>+
>         [MSE][GStreamer] Delete properly the stream from the WebKitMediaSource
>         https://bugs.webkit.org/show_bug.cgi?id=185242
> 
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>index 1557475e95fb6832105ba8d7938ca2486a90a4fd..34388c34849393ddfd6b721076d5da776517cd65 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>@@ -1207,10 +1207,11 @@ unsigned MediaPlayerPrivateGStreamerBase::videoDecodedByteCount() const
> #if ENABLE(ENCRYPTED_MEDIA)
> void MediaPlayerPrivateGStreamerBase::cdmInstanceAttached(CDMInstance& instance)
> {
>-    ASSERT(!m_cdmInstance);
>-    m_cdmInstance = &instance;
>-    GST_DEBUG_OBJECT(pipeline(), "CDM instance %p set", m_cdmInstance.get());
>-    m_protectionCondition.notifyAll();
>+    if (m_cdmInstance != &instance) {
>+        m_cdmInstance = &instance;
>+        GST_DEBUG_OBJECT(pipeline(), "CDM instance %p set", m_cdmInstance.get());
>+        m_protectionCondition.notifyAll();
>+    }
> }
> 
> void MediaPlayerPrivateGStreamerBase::cdmInstanceDetached(CDMInstance& instance)
>@@ -1218,10 +1219,11 @@ void MediaPlayerPrivateGStreamerBase::cdmInstanceDetached(CDMInstance& instance)
> #ifdef NDEBUG
>     UNUSED_PARAM(instance);
> #endif
>-    ASSERT(m_cdmInstance.get() == &instance);
>-    GST_DEBUG_OBJECT(pipeline(), "detaching CDM instance %p", m_cdmInstance.get());
>-    m_cdmInstance = nullptr;
>-    m_protectionCondition.notifyAll();
>+    if (m_cdmInstance.get() == &instance) {
>+        GST_DEBUG_OBJECT(pipeline(), "detaching CDM instance %p", m_cdmInstance.get());
>+        m_cdmInstance = nullptr;
>+        m_protectionCondition.notifyAll();
>+    }
> }
> 
> void MediaPlayerPrivateGStreamerBase::attemptToDecryptWithInstance(CDMInstance& instance)

Actions: View | Formatted Diff | Diff

Attachments on bug 185244: 339483 | 339501 | 339714 | 339809