Diff
Modified: trunk/Source/WebCore/ChangeLog (201830 => 201831)
--- trunk/Source/WebCore/ChangeLog 2016-06-08 20:59:49 UTC (rev 201830)
+++ trunk/Source/WebCore/ChangeLog 2016-06-08 21:07:42 UTC (rev 201831)
@@ -1,3 +1,34 @@
+2016-06-08 Eric Carlson <eric.carl...@apple.com>
+
+ HTMLMediaElement.prototype.canPlayType accounting for 250-750ms first loading theverge.com
+ https://bugs.webkit.org/show_bug.cgi?id=158335
+ <rdar://problem/26615416>
+
+ Reviewed by Brent Fulgham.
+
+ * WebCore.xcodeproj/project.pbxproj: Add AVFoundationMIMETypeCache.
+
+ * platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.h: Added.
+ * platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.mm: Added.
+ (WebCore::AVFoundationMIMETypeCache::AVFoundationMIMETypeCache):
+ (WebCore::AVFoundationMIMETypeCache::loadTypes):
+ (WebCore::AVFoundationMIMETypeCache::types):
+ (WebCore::AVFoundationMIMETypeCache::singleton):
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::registerMediaEngine): Start MIME type loading.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::getSupportedTypes): Use AVFoundationMIMETypeCache.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsType): Ditto.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsKeySystem): Ditto.
+ (WebCore::avfMIMETypes): Deleted.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::registerMediaEngine): Start MIME type loading.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::isAvailable): Use AVFoundationMIMETypeCache.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::getSupportedTypes): Ditto.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::supportsType): Ditto.
+ (WebCore::mimeTypeCache): Deleted.
+
2016-06-07 Ryosuke Niwa <rn...@webkit.org>
REGRESSION (r201667): ASSERTION FAILED: !m_anchorNode || !editingIgnoresContent(*m_anchorNode)
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (201830 => 201831)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-06-08 20:59:49 UTC (rev 201830)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-06-08 21:07:42 UTC (rev 201831)
@@ -112,6 +112,7 @@
070F549817F12F6B00169E04 /* MediaStreamConstraintsValidationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 070F549717F12F6B00169E04 /* MediaStreamConstraintsValidationClient.h */; };
070F549E17F2402700169E04 /* AudioDestinationConsumer.h in Headers */ = {isa = PBXBuildFile; fileRef = 070F549D17F2402700169E04 /* AudioDestinationConsumer.h */; settings = {ATTRIBUTES = (Private, ); }; };
0711589117DF6F6600EDFE2B /* MediaStreamPrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0711588F17DF633700EDFE2B /* MediaStreamPrivate.cpp */; };
+ 0719427F1D088F21002AA51D /* AVFoundationMIMETypeCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07C8AD111D073D630087C5CE /* AVFoundationMIMETypeCache.mm */; };
071A9EC2168FBC43002629F9 /* TextTrackCueGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071A9EC0168FB56C002629F9 /* TextTrackCueGeneric.cpp */; };
071A9EC3168FBC55002629F9 /* TextTrackCueGeneric.h in Headers */ = {isa = PBXBuildFile; fileRef = 071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */; settings = {ATTRIBUTES = (Private, ); }; };
071E496E1AD5AA0D008A50B4 /* MediaPlaybackTargetMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 071E496D1AD5AA0D008A50B4 /* MediaPlaybackTargetMac.mm */; };
@@ -7721,6 +7722,8 @@
07C59B6517F784BA000FBCBB /* MediaSourceSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaSourceSettings.cpp; sourceTree = "<group>"; };
07C59B6617F784BA000FBCBB /* MediaSourceSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSourceSettings.h; sourceTree = "<group>"; };
07C59B6D17F794F6000FBCBB /* JSMediaStreamTrackCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamTrackCustom.cpp; sourceTree = "<group>"; };
+ 07C8AD111D073D630087C5CE /* AVFoundationMIMETypeCache.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AVFoundationMIMETypeCache.mm; sourceTree = "<group>"; };
+ 07C8AD121D073D630087C5CE /* AVFoundationMIMETypeCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVFoundationMIMETypeCache.h; sourceTree = "<group>"; };
07CA120D182D67D800D12197 /* JSRTCPeerConnectionCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCPeerConnectionCustom.cpp; sourceTree = "<group>"; };
07CE77D416712A6A00C55A47 /* InbandTextTrackPrivateClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InbandTextTrackPrivateClient.h; sourceTree = "<group>"; };
07D6373E1BB0B11300256CE9 /* WebAudioSourceProviderAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAudioSourceProviderAVFObjC.h; sourceTree = "<group>"; };
@@ -23347,6 +23350,8 @@
CDE3A85517F6020400C5BE20 /* AudioTrackPrivateAVFObjC.mm */,
CD54A760180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.cpp */,
CD54A761180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.h */,
+ 07C8AD111D073D630087C5CE /* AVFoundationMIMETypeCache.mm */,
+ 07C8AD121D073D630087C5CE /* AVFoundationMIMETypeCache.h */,
CDE595941BF166D100A1CBE8 /* CDMSessionAVContentKeySession.h */,
CDE595931BF166AD00A1CBE8 /* CDMSessionAVContentKeySession.mm */,
CDDE02EA18B3ED6D00CF7FF1 /* CDMSessionAVFoundationObjC.h */,
@@ -31487,6 +31492,7 @@
073794F919F5864E00E5A045 /* RTCDataChannelHandlerMock.cpp in Sources */,
078E090717D14CEE00420AA1 /* RTCDTMFSender.cpp in Sources */,
073794FB19F5864E00E5A045 /* RTCDTMFSenderHandlerMock.cpp in Sources */,
+ 0719427F1D088F21002AA51D /* AVFoundationMIMETypeCache.mm in Sources */,
078E090817D14CEE00420AA1 /* RTCDTMFToneChangeEvent.cpp in Sources */,
078E090917D14CEE00420AA1 /* RTCIceCandidate.cpp in Sources */,
073BE34F17D18183002BD431 /* RTCIceCandidateDescriptor.cpp in Sources */,
Added: trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.h (0 => 201831)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.h 2016-06-08 21:07:42 UTC (rev 201831)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef AVFoundationMIMETypeCache_h
+#define AVFoundationMIMETypeCache_h
+
+#if ENABLE(VIDEO) && USE(AVFOUNDATION)
+
+#include <wtf/Forward.h>
+#include <wtf/HashSet.h>
+#include <wtf/text/StringHash.h>
+
+namespace WebCore {
+
+class AVFoundationMIMETypeCache {
+public:
+ static AVFoundationMIMETypeCache& singleton();
+
+ AVFoundationMIMETypeCache();
+
+ void loadTypes();
+ const HashSet<String, ASCIICaseInsensitiveHash>& types();
+
+private:
+ enum MIMETypeLoadStatus { NotLoaded, Loading, Loaded };
+
+ MIMETypeLoadStatus m_status { NotLoaded };
+ dispatch_queue_t m_loaderQueue;
+ Lock m_lock;
+ HashSet<String, ASCIICaseInsensitiveHash> m_cache;
+};
+
+}
+#endif
+#endif
Added: trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.mm (0 => 201831)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.mm (rev 0)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.mm 2016-06-08 21:07:42 UTC (rev 201831)
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "AVFoundationMIMETypeCache.h"
+
+#if ENABLE(VIDEO) && USE(AVFOUNDATION)
+
+#import <AVFoundation/AVAsset.h>
+#import <wtf/HashMap.h>
+#import <wtf/Locker.h>
+#import <wtf/NeverDestroyed.h>
+
+#import "CoreMediaSoftLink.h"
+
+SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
+SOFT_LINK_CLASS(AVFoundation, AVURLAsset)
+
+namespace WebCore {
+
+AVFoundationMIMETypeCache::AVFoundationMIMETypeCache()
+{
+ m_loaderQueue = dispatch_queue_create("WebCoreAudioVisualMIMETypes loader queue", DISPATCH_QUEUE_SERIAL);
+}
+
+void AVFoundationMIMETypeCache::loadTypes()
+{
+ {
+ Locker<Lock> lock(m_lock);
+
+ if (m_status != NotLoaded)
+ return;
+
+ if (!AVFoundationLibrary()) {
+ m_status = Loaded;
+ return;
+ }
+
+ m_status = Loading;
+ }
+
+ dispatch_async(m_loaderQueue, [this] {
+ for (NSString *type in [getAVURLAssetClass() audiovisualMIMETypes])
+ m_cache.add(type);
+ m_lock.lock();
+ m_status = Loaded;
+ m_lock.unlock();
+ });
+}
+
+const HashSet<String, ASCIICaseInsensitiveHash>& AVFoundationMIMETypeCache::types()
+{
+ m_lock.lock();
+ MIMETypeLoadStatus status = m_status;
+ m_lock.unlock();
+
+ if (status != Loaded) {
+ loadTypes();
+ dispatch_sync(m_loaderQueue, ^{ });
+ }
+
+ return m_cache;
+}
+
+AVFoundationMIMETypeCache& AVFoundationMIMETypeCache::singleton()
+{
+ static NeverDestroyed<AVFoundationMIMETypeCache> cache;
+ return cache.get();
+}
+
+}
+
+#endif
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (201830 => 201831)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-06-08 20:59:49 UTC (rev 201830)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-06-08 21:07:42 UTC (rev 201831)
@@ -28,6 +28,7 @@
#if ENABLE(VIDEO) && USE(AVFOUNDATION)
#import "MediaPlayerPrivateAVFoundationObjC.h"
+#import "AVFoundationMIMETypeCache.h"
#import "AVFoundationSPI.h"
#import "AVTrackPrivateAVFObjCImpl.h"
#import "AudioSourceProviderAVFObjC.h"
@@ -45,13 +46,12 @@
#import "InbandMetadataTextTrackPrivateAVF.h"
#import "InbandTextTrackPrivateAVFObjC.h"
#import "InbandTextTrackPrivateLegacyAVFObjC.h"
-#import "OutOfBandTextTrackPrivateAVF.h"
-#import "URL.h"
#import "Logging.h"
#import "MediaPlaybackTargetMac.h"
#import "MediaPlaybackTargetMock.h"
#import "MediaSelectionGroupAVFObjC.h"
#import "MediaTimeAVFoundation.h"
+#import "OutOfBandTextTrackPrivateAVF.h"
#import "PixelBufferConformerCV.h"
#import "PlatformTimeRanges.h"
#import "QuartzCoreSPI.h"
@@ -61,6 +61,7 @@
#import "TextEncoding.h"
#import "TextTrackRepresentation.h"
#import "TextureCacheCV.h"
+#import "URL.h"
#import "UUID.h"
#import "VideoTextureCopierCV.h"
#import "VideoTrackPrivateAVFObjC.h"
@@ -423,9 +424,12 @@
void MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(MediaEngineRegistrar registrar)
{
- if (isAvailable())
- registrar([](MediaPlayer* player) { return std::make_unique<MediaPlayerPrivateAVFoundationObjC>(player); },
+ if (!isAvailable())
+ return;
+
+ registrar([](MediaPlayer* player) { return std::make_unique<MediaPlayerPrivateAVFoundationObjC>(player); },
getSupportedTypes, supportsType, originsInMediaCache, clearMediaCache, clearMediaCacheForOrigins, supportsKeySystem);
+ AVFoundationMIMETypeCache::singleton().loadTypes();
}
static AVAssetCache *assetCacheForPath(const String& path)
@@ -1610,18 +1614,6 @@
}
}
-static const HashSet<String, ASCIICaseInsensitiveHash>& avfMIMETypes()
-{
- static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache = []() {
- HashSet<String, ASCIICaseInsensitiveHash> types;
- for (NSString *type in [AVURLAsset audiovisualMIMETypes])
- types.add(type);
- return types;
- }();
-
- return cache;
-}
-
RetainPtr<CGImageRef> MediaPlayerPrivateAVFoundationObjC::createImageForTimeInRect(float time, const FloatRect& rect)
{
if (!m_imageGenerator)
@@ -1646,7 +1638,8 @@
void MediaPlayerPrivateAVFoundationObjC::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& supportedTypes)
{
- supportedTypes = avfMIMETypes();
+ LOG(Media, "MediaPlayerPrivateAVFoundationObjC::getSupportedTypes");
+ supportedTypes = AVFoundationMIMETypeCache::singleton().types();
}
#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
@@ -1693,7 +1686,7 @@
if (isUnsupportedMIMEType(parameters.type))
return MediaPlayer::IsNotSupported;
- if (!staticMIMETypeList().contains(parameters.type) && !avfMIMETypes().contains(parameters.type))
+ if (!staticMIMETypeList().contains(parameters.type) && !AVFoundationMIMETypeCache::singleton().types().contains(parameters.type))
return MediaPlayer::IsNotSupported;
// The spec says:
@@ -1719,7 +1712,7 @@
if (!mimeType.isEmpty() && isUnsupportedMIMEType(mimeType))
return false;
- if (!mimeType.isEmpty() && !staticMIMETypeList().contains(mimeType) && !avfMIMETypes().contains(mimeType))
+ if (!mimeType.isEmpty() && !staticMIMETypeList().contains(mimeType) && !AVFoundationMIMETypeCache::singleton().types().contains(mimeType))
return false;
return true;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (201830 => 201831)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-06-08 20:59:49 UTC (rev 201830)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-06-08 21:07:42 UTC (rev 201831)
@@ -28,6 +28,7 @@
#if ENABLE(MEDIA_SOURCE) && USE(AVFOUNDATION)
+#import "AVFoundationMIMETypeCache.h"
#import "CDMSessionAVStreamSession.h"
#import "CDMSessionMediaSourceAVFObjC.h"
#import "FileSystem.h"
@@ -202,9 +203,12 @@
void MediaPlayerPrivateMediaSourceAVFObjC::registerMediaEngine(MediaEngineRegistrar registrar)
{
- if (isAvailable())
- registrar([](MediaPlayer* player) { return std::make_unique<MediaPlayerPrivateMediaSourceAVFObjC>(player); }, getSupportedTypes,
- supportsType, 0, 0, 0, 0);
+ if (!isAvailable())
+ return;
+
+ registrar([](MediaPlayer* player) { return std::make_unique<MediaPlayerPrivateMediaSourceAVFObjC>(player); },
+ getSupportedTypes, supportsType, 0, 0, 0, 0);
+ AVFoundationMIMETypeCache::singleton().loadTypes();
}
bool MediaPlayerPrivateMediaSourceAVFObjC::isAvailable()
@@ -217,25 +221,9 @@
&& class_getInstanceMethod(getAVSampleBufferAudioRendererClass(), @selector(setMuted:));
}
-static const HashSet<String, ASCIICaseInsensitiveHash>& mimeTypeCache()
-{
- static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> cache;
- static bool typeListInitialized = false;
-
- if (typeListInitialized)
- return cache;
- typeListInitialized = true;
-
- NSArray *types = [getAVURLAssetClass() audiovisualMIMETypes];
- for (NSString *mimeType in types)
- cache.get().add(mimeType);
-
- return cache;
-}
-
void MediaPlayerPrivateMediaSourceAVFObjC::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types)
{
- types = mimeTypeCache();
+ types = AVFoundationMIMETypeCache::singleton().types();
}
MediaPlayer::SupportsType MediaPlayerPrivateMediaSourceAVFObjC::supportsType(const MediaEngineSupportParameters& parameters)
@@ -248,7 +236,7 @@
return MediaPlayer::IsNotSupported;
#endif
- if (parameters.type.isEmpty() || !mimeTypeCache().contains(parameters.type))
+ if (parameters.type.isEmpty() || !AVFoundationMIMETypeCache::singleton().types().contains(parameters.type))
return MediaPlayer::IsNotSupported;
// The spec says:
