Attachment 373355 Details for Bug 199419 – Patch

[patch] Patch

bug-199419-20190702133628.patch (text/plain), 2.02 KB, created by Jer Noble on 2019-07-02 13:36:29 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2019-07-02 13:36:29 PDT

Size: 2.02 KB

patch

obsolete

>Subversion Revision: 246814
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 318bc948c3f41c31b3c3399de339e9a0ad9c5a7e..8fdc54be42744840860c60e1defe014c59eb5b8f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-07-02  Jer Noble  <jer.noble@apple.com>
>+
>+        Exception thrown from -[AVSampleBufferRenderSynchronizer addRenderer:], not a valid renderer.
>+        https://bugs.webkit.org/show_bug.cgi?id=199419
>+        <rdar://problem/52141139>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Sometimes, -[AVSampleBufferDisplayLayer init] will return nil. When that happens, passing a nil
>+        pointer to -addRenderer: will throw an exception.
>+
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
>+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::ensureLayer):
>+
> 2019-06-25  Keith Miller  <keith_miller@apple.com>
> 
>         Unreviewed, windows build fix.
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>index 78e6247251e3938e76edd2de5515c11d0ba3908b..fc3907a8b7ec415d6cce139a442c017d8d6fb8c8 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>@@ -722,6 +722,13 @@ void MediaPlayerPrivateMediaSourceAVFObjC::ensureLayer()
>     [m_sampleBufferDisplayLayer setName:@"MediaPlayerPrivateMediaSource AVSampleBufferDisplayLayer"];
> #endif
> 
>+    ASSERT(m_sampleBufferDisplayLayer);
>+    if (!m_sampleBufferDisplayLayer) {
>+        ERROR_LOG(LOGIDENTIFIER, "Failed to create AVSampleBufferDisplayLayer");
>+        setNetworkState(MediaPlayer::DecodeError);
>+        return;
>+    }
>+
>     [m_synchronizer addRenderer:m_sampleBufferDisplayLayer.get()];
>     if (m_mediaSourcePrivate)
>         m_mediaSourcePrivate->setVideoLayer(m_sampleBufferDisplayLayer.get());

Actions: View | Formatted Diff | Diff

Attachments on bug 199419: 373355