Attachment 350069 Details for Bug 189720 – Patch

[patch] Patch

bug-189720-20180918154140.patch (text/plain), 2.80 KB, created by Jer Noble on 2018-09-18 15:41:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2018-09-18 15:41:41 PDT

Size: 2.80 KB

patch

obsolete

>Subversion Revision: 236078
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 026e128ccbf1449da21c5a6b12416c34f62a38cd..a99a5e4b5c84a4f6b8430837b3a5c31e70908f08 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-09-18  Jer Noble  <jer.noble@apple.com>
>+
>+        REGRESSION (r236006): New waitingForKey() requirement breaks Modern EME tests.
>+        https://bugs.webkit.org/show_bug.cgi?id=189720
>+        <rdar://problem/44572140>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Always call waitingForKey() after calling initializationDataEncountered().
>+
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForLoadingOfResource):
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
>+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::initializationDataEncountered):
>+
> 2018-09-12  Jer Noble  <jer.noble@apple.com>
> 
>         Add support for HEVC codec types in Media Capabilities
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>index 0fb1308d9a8a1170694d2b3216946d4432ac06ee..ad26e589cc00762587f1433f6f0b1a1379916fa1 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>@@ -1788,6 +1788,7 @@ bool MediaPlayerPrivateAVFoundationObjC::shouldWaitForLoadingOfResource(AVAssetR
>         RetainPtr<NSData> keyURIData = [keyURI dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES];
>         auto keyURIBuffer = SharedBuffer::create(keyURIData.get());
>         player()->initializationDataEncountered("skd"_s, keyURIBuffer->tryCreateArrayBuffer());
>+        player()->waitingForKey();
> #endif
>         return true;
>     }
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>index b02c6232c012c6d72ec276573d7b8ae8e0e38598..4c108735ee369c13cc5086f2c134b7e044d23335 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>@@ -969,6 +969,7 @@ void MediaPlayerPrivateMediaSourceAVFObjC::attemptToDecryptWithInstance(CDMInsta
> void MediaPlayerPrivateMediaSourceAVFObjC::initializationDataEncountered(const String& initDataType, RefPtr<ArrayBuffer>&& initData)
> {
>     m_player->initializationDataEncountered(initDataType, WTFMove(initData));
>+    m_player->waitingForKey();
> }
> #endif
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189720: 350069