Title: [229626] trunk/Source/WebCore
- Revision
- 229626
- Author
- [email protected]
- Date
- 2018-03-15 09:58:13 -0700 (Thu, 15 Mar 2018)
Log Message
Adopt new AVURLAssetUseClientURLLoadingExclusively AVURLAsset creation option.
https://bugs.webkit.org/show_bug.cgi?id=183660
Reviewed by Jon Lee.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (229625 => 229626)
--- trunk/Source/WebCore/ChangeLog 2018-03-15 16:17:24 UTC (rev 229625)
+++ trunk/Source/WebCore/ChangeLog 2018-03-15 16:58:13 UTC (rev 229626)
@@ -1,3 +1,13 @@
+2018-03-15 Jer Noble <[email protected]>
+
+ Adopt new AVURLAssetUseClientURLLoadingExclusively AVURLAsset creation option.
+ https://bugs.webkit.org/show_bug.cgi?id=183660
+
+ Reviewed by Jon Lee.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+
2018-03-15 Chris Dumez <[email protected]>
Unreviewed, fix tiny mistake in r229615 that caused API tests failures.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (229625 => 229626)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-03-15 16:17:24 UTC (rev 229625)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-03-15 16:58:13 UTC (rev 229626)
@@ -188,6 +188,7 @@
SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetClientBundleIdentifierKey, NSString *)
SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetRequiresCustomURLLoadingKey, NSString *)
SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetOutOfBandMIMETypeKey, NSString *)
+SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetUseClientURLLoadingExclusively, NSString *)
#define AVPlayer initAVPlayer()
#define AVPlayerItem initAVPlayerItem()
@@ -211,6 +212,7 @@
#define AVURLAssetClientBundleIdentifierKey getAVURLAssetClientBundleIdentifierKey()
#define AVURLAssetRequiresCustomURLLoadingKey getAVURLAssetRequiresCustomURLLoadingKey()
#define AVURLAssetOutOfBandMIMETypeKey getAVURLAssetOutOfBandMIMETypeKey()
+#define AVURLAssetUseClientURLLoadingExclusively getAVURLAssetUseClientURLLoadingExclusively()
#define AVAssetImageGeneratorApertureModeCleanAperture getAVAssetImageGeneratorApertureModeCleanAperture()
#define AVURLAssetReferenceRestrictionsKey getAVURLAssetReferenceRestrictionsKey()
#define AVLayerVideoGravityResizeAspect getAVLayerVideoGravityResizeAspect()
@@ -887,14 +889,15 @@
if (player()->doesHaveAttribute("x-itunes-inherit-uri-query-component"))
[options.get() setObject:@YES forKey: AVURLAssetInheritURIQueryComponentFromReferencingURIKey];
+ if (AVURLAssetUseClientURLLoadingExclusively)
+ [options setObject:@YES forKey:AVURLAssetUseClientURLLoadingExclusively];
#if PLATFORM(IOS)
+ else if (AVURLAssetRequiresCustomURLLoadingKey)
+ [options setObject:@YES forKey:AVURLAssetRequiresCustomURLLoadingKey];
// FIXME: rdar://problem/20354688
String identifier = player()->sourceApplicationIdentifier();
if (!identifier.isEmpty() && AVURLAssetClientBundleIdentifierKey)
[options setObject:identifier forKey:AVURLAssetClientBundleIdentifierKey];
-
- if (AVURLAssetRequiresCustomURLLoadingKey)
- [options setObject:@YES forKey:AVURLAssetRequiresCustomURLLoadingKey];
#endif
auto type = player()->contentMIMEType();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
