<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184916] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184916">184916</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-27 13:33:09 -0700 (Wed, 27 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] short-circuit MIME type lookup when possible
https://bugs.webkit.org/show_bug.cgi?id=145362
Reviewed by Jer Noble.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::isUnsupportedMIMEType): Renamed from unsupportedMIMEType. Convert type to lower case
once instead of calling equalIgnoringCase many times.
(WebCore::staticMIMETypeList): Renamed from staticMimeTypeCache. Initialize static set in a lambda,
using an array of C strings in a loop.
(WebCore::avfMIMETypes): Renamed from avfMimeTypeCache. Initialize static set in a lambda.
(WebCore::MediaPlayerPrivateAVFoundationObjC::getSupportedTypes): avfMimeTypeCache -> avfMIMETypes.
(WebCore::keySystemIsSupported): equalIgnoringCase -> equalIgnoringASCIICase.
(WebCore::MediaPlayerPrivateAVFoundationObjC::supportsType): Ditto.
(WebCore::MediaPlayerPrivateAVFoundationObjC::supportsKeySystem): unsupportedMIMEType ->
isUnsupportedMIMEType, equalIgnoringCase -> equalIgnoringASCIICase, staticMimeTypeCache ->
staticMIMETypeList, avfMimeTypeCache -> avfMIMETypes.
(WebCore::unsupportedMIMEType): Deleted.
(WebCore::staticMimeTypeCache): Deleted.
(WebCore::avfMimeTypeCache): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184915 => 184916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-27 20:14:05 UTC (rev 184915)
+++ trunk/Source/WebCore/ChangeLog 2015-05-27 20:33:09 UTC (rev 184916)
</span><span class="lines">@@ -3,6 +3,29 @@
</span><span class="cx"> [Mac] short-circuit MIME type lookup when possible
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145362
</span><span class="cx">
</span><ins>+ Reviewed by Jer Noble.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::isUnsupportedMIMEType): Renamed from unsupportedMIMEType. Convert type to lower case
+ once instead of calling equalIgnoringCase many times.
+ (WebCore::staticMIMETypeList): Renamed from staticMimeTypeCache. Initialize static set in a lambda,
+ using an array of C strings in a loop.
+ (WebCore::avfMIMETypes): Renamed from avfMimeTypeCache. Initialize static set in a lambda.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::getSupportedTypes): avfMimeTypeCache -> avfMIMETypes.
+ (WebCore::keySystemIsSupported): equalIgnoringCase -> equalIgnoringASCIICase.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsType): Ditto.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsKeySystem): unsupportedMIMEType ->
+ isUnsupportedMIMEType, equalIgnoringCase -> equalIgnoringASCIICase, staticMimeTypeCache ->
+ staticMIMETypeList, avfMimeTypeCache -> avfMIMETypes.
+ (WebCore::unsupportedMIMEType): Deleted.
+ (WebCore::staticMimeTypeCache): Deleted.
+ (WebCore::avfMimeTypeCache): Deleted.
+
+2015-05-27 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] short-circuit MIME type lookup when possible
+ https://bugs.webkit.org/show_bug.cgi?id=145362
+
</ins><span class="cx"> Reviewed by Dean Jackson.
</span><span class="cx">
</span><span class="cx"> * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (184915 => 184916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-27 20:14:05 UTC (rev 184915)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-27 20:33:09 UTC (rev 184916)
</span><span class="lines">@@ -1545,87 +1545,92 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool unsupportedMIMEType(const String& type)
</del><ins>+static bool isUnsupportedMIMEType(const String& type)
</ins><span class="cx"> {
</span><ins>+ String lowerCaseType = type.convertToASCIILowercase();
+
</ins><span class="cx"> // AVFoundation will return non-video MIME types which it claims to support, but which we
</span><span class="cx"> // do not support in the <video> element. Reject all non video/, audio/, and application/ types.
</span><del>- if (!type.startsWith("video/", false) && !type.startsWith("audio/", false) && !type.startsWith("application/", false))
</del><ins>+ if (!lowerCaseType.startsWith("video/") && !lowerCaseType.startsWith("audio/") && !lowerCaseType.startsWith("application/"))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Reject types we know AVFoundation does not support that sites commonly ask about.
</span><del>- if (equalIgnoringCase(type, "video/webm") || equalIgnoringCase(type, "audio/webm") || equalIgnoringCase(type, "video/x-webm"))
</del><ins>+ if (lowerCaseType == "video/webm" || lowerCaseType == "audio/webm" || lowerCaseType == "video/x-webm")
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (equalIgnoringCase(type, "video/x-flv"))
</del><ins>+ if (lowerCaseType == "video/x-flv")
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (equalIgnoringCase(type, "audio/ogg") || equalIgnoringCase(type, "video/ogg") || equalIgnoringCase(type, "application/ogg"))
</del><ins>+ if (lowerCaseType == "audio/ogg" || lowerCaseType == "video/ogg" || lowerCaseType == "application/ogg")
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (equalIgnoringCase(type, "video/h264"))
</del><ins>+ if (lowerCaseType == "video/h264")
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static HashSet<String>& staticMimeTypeCache()
</del><ins>+static const HashSet<String>& staticMIMETypeList()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> cache;
- static bool typeListInitialized = false;
</del><ins>+ static NeverDestroyed<HashSet<String>> cache = [] () {
+ HashSet<String> types;
</ins><span class="cx">
</span><del>- if (typeListInitialized)
- return cache;
- typeListInitialized = true;
</del><ins>+ static const char* typeNames[] = {
+ "application/vnd.apple.mpegurl",
+ "application/x-mpegurl",
+ "audio/3gpp",
+ "audio/aac",
+ "audio/aacp",
+ "audio/aiff",
+ "audio/basic",
+ "audio/mp3",
+ "audio/mp4",
+ "audio/mpeg",
+ "audio/mpeg3",
+ "audio/mpegurl",
+ "audio/mpg",
+ "audio/wav",
+ "audio/wave",
+ "audio/x-aac",
+ "audio/x-aiff",
+ "audio/x-m4a",
+ "audio/x-mpegurl",
+ "audio/x-wav",
+ "video/3gpp",
+ "video/3gpp2",
+ "video/mp4",
+ "video/mpeg",
+ "video/mpeg2",
+ "video/mpg",
+ "video/quicktime",
+ "video/x-m4v",
+ "video/x-mpeg",
+ "video/x-mpg",
+ };
+ for (size_t i = 0; i < WTF_ARRAY_LENGTH(typeNames); ++i)
+ types.add(typeNames[i]);
</ins><span class="cx">
</span><del>- cache.get().add("application/vnd.apple.mpegurl");
- cache.get().add("application/x-mpegurl");
- cache.get().add("audio/3gpp");
- cache.get().add("audio/aac");
- cache.get().add("audio/aacp");
- cache.get().add("audio/aiff");
- cache.get().add("audio/basic");
- cache.get().add("audio/mp3");
- cache.get().add("audio/mp4");
- cache.get().add("audio/mpeg");
- cache.get().add("audio/mpeg3");
- cache.get().add("audio/mpegurl");
- cache.get().add("audio/mpg");
- cache.get().add("audio/wav");
- cache.get().add("audio/wave");
- cache.get().add("audio/x-aac");
- cache.get().add("audio/x-aiff");
- cache.get().add("audio/x-m4a");
- cache.get().add("audio/x-mpegurl");
- cache.get().add("audio/x-wav");
- cache.get().add("video/3gpp");
- cache.get().add("video/3gpp2");
- cache.get().add("video/mp4");
- cache.get().add("video/mpeg");
- cache.get().add("video/mpeg2");
- cache.get().add("video/mpg");
- cache.get().add("video/quicktime");
- cache.get().add("video/x-m4v");
- cache.get().add("video/x-mpeg");
- cache.get().add("video/x-mpg");
</del><ins>+ return types;
+ }();
</ins><span class="cx">
</span><span class="cx"> return cache;
</span><del>-}
</del><ins>+}
</ins><span class="cx">
</span><del>-static HashSet<String>& avfMimeTypeCache()
</del><ins>+static const HashSet<String>& avfMIMETypes()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<HashSet<String>> cache;
- static bool typeListInitialized = false;
</del><ins>+ static NeverDestroyed<HashSet<String>> cache = [] () {
+ HashSet<String> types;
</ins><span class="cx">
</span><del>- if (typeListInitialized)
- return cache;
- typeListInitialized = true;
</del><ins>+ NSArray *nsTypes = [AVURLAsset audiovisualMIMETypes];
+ for (NSString *mimeType in nsTypes)
+ types.add([mimeType lowercaseString]);
</ins><span class="cx">
</span><del>- NSArray *types = [AVURLAsset audiovisualMIMETypes];
- for (NSString *mimeType in types)
- cache.get().add([mimeType lowercaseString]);
</del><ins>+ return types;
+ }();
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> return cache;
</span><del>-}
</del><ins>+}
</ins><span class="cx">
</span><span class="cx"> RetainPtr<CGImageRef> MediaPlayerPrivateAVFoundationObjC::createImageForTimeInRect(float time, const FloatRect& rect)
</span><span class="cx"> {
</span><span class="lines">@@ -1651,13 +1656,13 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::getSupportedTypes(HashSet<String>& supportedTypes)
</span><span class="cx"> {
</span><del>- supportedTypes = avfMimeTypeCache();
</del><ins>+ supportedTypes = avfMIMETypes();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> static bool keySystemIsSupported(const String& keySystem)
</span><span class="cx"> {
</span><del>- if (equalIgnoringCase(keySystem, "com.apple.fps") || equalIgnoringCase(keySystem, "com.apple.fps.1_0") || equalIgnoringCase(keySystem, "org.w3c.clearkey"))
</del><ins>+ if (equalIgnoringASCIICase(keySystem, "com.apple.fps") || equalIgnoringASCIICase(keySystem, "com.apple.fps.1_0") || equalIgnoringASCIICase(keySystem, "org.w3c.clearkey"))
</ins><span class="cx"> return true;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1673,7 +1678,7 @@
</span><span class="cx"> // If keySystem is null, continue to the next step.
</span><span class="cx"> if (!parameters.keySystem.isNull() && !parameters.keySystem.isEmpty()) {
</span><span class="cx"> // "Clear Key" is only supported with HLS:
</span><del>- if (equalIgnoringCase(parameters.keySystem, "org.w3c.clearkey") && !parameters.type.isEmpty() && !equalIgnoringCase(parameters.type, "application/x-mpegurl"))
</del><ins>+ if (equalIgnoringASCIICase(parameters.keySystem, "org.w3c.clearkey") && !parameters.type.isEmpty() && !equalIgnoringASCIICase(parameters.type, "application/x-mpegurl"))
</ins><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx">
</span><span class="cx"> // If keySystem contains an unrecognized or unsupported Key System, return the empty string
</span><span class="lines">@@ -1692,10 +1697,10 @@
</span><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (unsupportedMIMEType(parameters.type))
</del><ins>+ if (isUnsupportedMIMEType(parameters.type))
</ins><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx">
</span><del>- if (!staticMimeTypeCache().contains(parameters.type) && !avfMimeTypeCache().contains(parameters.type))
</del><ins>+ if (!staticMIMETypeList().contains(parameters.type) && !avfMIMETypes().contains(parameters.type))
</ins><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx">
</span><span class="cx"> // The spec says:
</span><span class="lines">@@ -1712,16 +1717,16 @@
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> if (!keySystem.isEmpty()) {
</span><span class="cx"> // "Clear Key" is only supported with HLS:
</span><del>- if (equalIgnoringCase(keySystem, "org.w3c.clearkey") && !mimeType.isEmpty() && !equalIgnoringCase(mimeType, "application/x-mpegurl"))
</del><ins>+ if (equalIgnoringASCIICase(keySystem, "org.w3c.clearkey") && !mimeType.isEmpty() && !equalIgnoringASCIICase(mimeType, "application/x-mpegurl"))
</ins><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx">
</span><span class="cx"> if (!keySystemIsSupported(keySystem))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!mimeType.isEmpty() && unsupportedMIMEType(mimeType))
</del><ins>+ if (!mimeType.isEmpty() && isUnsupportedMIMEType(mimeType))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!mimeType.isEmpty() && !staticMimeTypeCache().contains(mimeType) && !avfMimeTypeCache().contains(mimeType))
</del><ins>+ if (!mimeType.isEmpty() && !staticMIMETypeList().contains(mimeType) && !avfMIMETypes().contains(mimeType))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>