Attachment 342006 Details for Bug 186328 – Patch

[patch] Patch

bug-186328-20180605164710.patch (text/plain), 3.01 KB, created by Jer Noble on 2018-06-05 16:47:11 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2018-06-05 16:47:11 PDT

Size: 3.01 KB

patch

obsolete

>Subversion Revision: 232471
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ab572f3fe931b06803835321170bb0d7d88d2620..0d32044d21b179ccedf4f301f3074c14ca6b76b9 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-06-05  Jer Noble  <jer.noble@apple.com>
>+
>+        Set the AVAssetResourceLoaderRequest's contentType to AVStreamingKeyDeliveryContentKeyType in the case of a FPS key request.
>+        https://bugs.webkit.org/show_bug.cgi?id=186328
>+        <rdar://problem/40829228>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::attemptToDecryptWithInstance):
>+
> 2018-06-05  Jer Noble  <jer.noble@apple.com>
> 
>         REGRESSION (231817): Videos permanently blank out after switching out of a tab and back in
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>index 042c0a30c1464b245ad9642f790ec0b1a63afb86..3e6369eb40092c70cb8fc2b48aed559c5c9c4507 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>@@ -180,6 +180,7 @@ SOFT_LINK_POINTER(AVFoundation, AVURLAssetReferenceRestrictionsKey, NSString *)
> SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResizeAspect, NSString *)
> SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResizeAspectFill, NSString *)
> SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResize, NSString *)
>+SOFT_LINK_POINTER(AVFoundation, AVStreamingKeyDeliveryContentKeyType, NSString *)
> 
> SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetClientBundleIdentifierKey, NSString *)
> SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetRequiresCustomURLLoadingKey, NSString *)
>@@ -214,6 +215,7 @@ SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetUseClientURLLoadingExclusivel
> #define AVLayerVideoGravityResizeAspect getAVLayerVideoGravityResizeAspect()
> #define AVLayerVideoGravityResizeAspectFill getAVLayerVideoGravityResizeAspectFill()
> #define AVLayerVideoGravityResize getAVLayerVideoGravityResize()
>+#define AVStreamingKeyDeliveryContentKeyType getAVStreamingKeyDeliveryContentKeyType()
> 
> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
> typedef AVMediaSelectionGroup AVMediaSelectionGroupType;
>@@ -2485,8 +2487,11 @@ void MediaPlayerPrivateAVFoundationObjC::cdmInstanceDetached(CDMInstance& instan
> void MediaPlayerPrivateAVFoundationObjC::attemptToDecryptWithInstance(CDMInstance&)
> {
>     auto keyURIToRequestMap = WTFMove(m_keyURIToRequestMap);
>-    for (auto& request : keyURIToRequestMap.values())
>+    for (auto& request : keyURIToRequestMap.values()) {
>+        if (auto *infoRequest = request.get().contentInformationRequest)
>+            infoRequest.contentType = AVStreamingKeyDeliveryContentKeyType;
>         [request finishLoading];
>+    }
> }
> #endif
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186328: 342006 | 342029