<!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>[184910] 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/184910">184910</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-27 11:37:28 -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 Dean Jackson.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::unsupportedMIMEType): New, reject types known to not be supported.
(WebCore::staticMimeTypeCache): Accept MIME types known to be supported.
(WebCore::avfMimeTypeCache): Renamed from mimeTypeCache.
(WebCore::MediaPlayerPrivateAVFoundationObjC::getSupportedTypes): mimeTypeCache -> staticMimeTypeCache.
(WebCore::MediaPlayerPrivateAVFoundationObjC::supportsType): Return immediately if
unsupportedMIMEType returns true, don't call AVFoundation if staticMimeTypeCache returns true.
(WebCore::MediaPlayerPrivateAVFoundationObjC::supportsKeySystem): Ditto.
(WebCore::mimeTypeCache): 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 (184909 => 184910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-27 18:31:12 UTC (rev 184909)
+++ trunk/Source/WebCore/ChangeLog 2015-05-27 18:37:28 UTC (rev 184910)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-05-27 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><ins>+ [Mac] short-circuit MIME type lookup when possible
+ https://bugs.webkit.org/show_bug.cgi?id=145362
+
+ Reviewed by Dean Jackson.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::unsupportedMIMEType): New, reject types known to not be supported.
+ (WebCore::staticMimeTypeCache): Accept MIME types known to be supported.
+ (WebCore::avfMimeTypeCache): Renamed from mimeTypeCache.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::getSupportedTypes): mimeTypeCache -> staticMimeTypeCache.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsType): Return immediately if
+ unsupportedMIMEType returns true, don't call AVFoundation if staticMimeTypeCache returns true.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsKeySystem): Ditto.
+ (WebCore::mimeTypeCache): Deleted.
+
+2015-05-27 Eric Carlson <eric.carlson@apple.com>
+
</ins><span class="cx"> [Mac] occasional crash in MediaPlayerPrivateAVFoundationObjC::didStopLoadingRequest
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145409
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (184909 => 184910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-27 18:31:12 UTC (rev 184909)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-27 18:37:28 UTC (rev 184910)
</span><span class="lines">@@ -1545,18 +1545,84 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static HashSet<String> mimeTypeCache()
</del><ins>+static bool unsupportedMIMEType(const String& type)
</ins><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(HashSet<String>, cache, ());
</del><ins>+ // AVFoundation will return non-video MIME types which it claims to support, but which we
+ // do not support in the <video> element. Reject all non video/, audio/, and application/ types.
+ if (!type.startsWith("video/", false) && !type.startsWith("audio/", false) && !type.startsWith("application/", false))
+ return true;
+
+ // Reject types we know AVFoundation does not support that sites commonly ask about.
+ if (equalIgnoringCase(type, "video/webm") || equalIgnoringCase(type, "audio/webm") || equalIgnoringCase(type, "video/x-webm"))
+ return true;
+
+ if (equalIgnoringCase(type, "video/x-flv"))
+ return true;
+
+ if (equalIgnoringCase(type, "audio/ogg") || equalIgnoringCase(type, "video/ogg") || equalIgnoringCase(type, "application/ogg"))
+ return true;
+
+ if (equalIgnoringCase(type, "video/h264"))
+ return true;
+
+ return false;
+}
+
+static HashSet<String>& staticMimeTypeCache()
+{
+ static NeverDestroyed<HashSet<String>> cache;
</ins><span class="cx"> static bool typeListInitialized = false;
</span><span class="cx">
</span><span class="cx"> if (typeListInitialized)
</span><span class="cx"> return cache;
</span><span class="cx"> typeListInitialized = true;
</span><span class="cx">
</span><ins>+ 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");
+
+ return cache;
+}
+
+static HashSet<String>& avfMimeTypeCache()
+{
+ static NeverDestroyed<HashSet<String>> cache;
+ static bool typeListInitialized = false;
+
+ if (typeListInitialized)
+ return cache;
+ typeListInitialized = true;
+
</ins><span class="cx"> NSArray *types = [AVURLAsset audiovisualMIMETypes];
</span><span class="cx"> for (NSString *mimeType in types)
</span><del>- cache.add([mimeType lowercaseString]);
</del><ins>+ cache.get().add([mimeType lowercaseString]);
</ins><span class="cx">
</span><span class="cx"> return cache;
</span><span class="cx"> }
</span><span class="lines">@@ -1585,7 +1651,7 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::getSupportedTypes(HashSet<String>& supportedTypes)
</span><span class="cx"> {
</span><del>- supportedTypes = mimeTypeCache();
</del><ins>+ supportedTypes = avfMimeTypeCache();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="lines">@@ -1626,9 +1692,12 @@
</span><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (!mimeTypeCache().contains(parameters.type))
</del><ins>+ if (unsupportedMIMEType(parameters.type))
</ins><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx">
</span><ins>+ if (!staticMimeTypeCache().contains(parameters.type) && !avfMimeTypeCache().contains(parameters.type))
+ return MediaPlayer::IsNotSupported;
+
</ins><span class="cx"> // The spec says:
</span><span class="cx"> // "Implementors are encouraged to return "maybe" unless the type can be confidently established as being supported or not."
</span><span class="cx"> if (parameters.codecs.isEmpty())
</span><span class="lines">@@ -1649,9 +1718,12 @@
</span><span class="cx"> if (!keySystemIsSupported(keySystem))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!mimeType.isEmpty() && !mimeTypeCache().contains(mimeType))
</del><ins>+ if (!mimeType.isEmpty() && unsupportedMIMEType(mimeType))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!mimeType.isEmpty() && !staticMimeTypeCache().contains(mimeType) && !avfMimeTypeCache().contains(mimeType))
+ return false;
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> #else
</span></span></pre>
</div>
</div>
</body>
</html>