Title: [232542] trunk/Source/WebCore
- Revision
- 232542
- Author
- jer.no...@apple.com
- Date
- 2018-06-06 09:10:47 -0700 (Wed, 06 Jun 2018)
Log Message
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 Eric Carlson.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::attemptToDecryptWithInstance):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (232541 => 232542)
--- trunk/Source/WebCore/ChangeLog 2018-06-06 15:52:16 UTC (rev 232541)
+++ trunk/Source/WebCore/ChangeLog 2018-06-06 16:10:47 UTC (rev 232542)
@@ -1,3 +1,14 @@
+2018-06-06 Jer Noble <jer.no...@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 Eric Carlson.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::attemptToDecryptWithInstance):
+
2018-06-06 Zalan Bujtas <za...@apple.com>
[LFC] Add margin computation for floating, replaced elements.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (232541 => 232542)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-06-06 15:52:16 UTC (rev 232541)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-06-06 16:10:47 UTC (rev 232542)
@@ -180,6 +180,7 @@
SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspect, NSString *)
SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspectFill, NSString *)
SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResize, NSString *)
+SOFT_LINK_CONSTANT(AVFoundation, AVStreamingKeyDeliveryContentKeyType, NSString *)
SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetClientBundleIdentifierKey, NSString *)
SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetRequiresCustomURLLoadingKey, NSString *)
@@ -214,6 +215,7 @@
#define AVLayerVideoGravityResizeAspect getAVLayerVideoGravityResizeAspect()
#define AVLayerVideoGravityResizeAspectFill getAVLayerVideoGravityResizeAspectFill()
#define AVLayerVideoGravityResize getAVLayerVideoGravityResize()
+#define AVStreamingKeyDeliveryContentKeyType getAVStreamingKeyDeliveryContentKeyType()
#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
typedef AVMediaSelectionGroup AVMediaSelectionGroupType;
@@ -2474,8 +2476,11 @@
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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
