<!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>[167776] 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/167776">167776</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-04-24 14:46:19 -0700 (Thu, 24 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] don't ask for AVAssetTrack properties before they are available
https://bugs.webkit.org/show_bug.cgi?id=131902
<rdar://problem/16505076>
Reviewed by Brent Fulgham.
No new tests, the behavior this changes can not be tested with a layout test.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC): Initialize
m_cachedTotalBytes.
(WebCore::MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata): Don't report that
metadata has been loaded until the track properties we need have been loaded too.
(WebCore::MediaPlayerPrivateAVFoundationObjC::totalBytes): Cache totalBytes instead
of recalculating it every time.
(WebCore::MediaPlayerPrivateAVFoundationObjC::tracksDidChange): Invalidate cached
total bytes.
(WebCore::assetTrackMetadataKeyNames): Array of AVAssetTrack properties we use.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</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 (167775 => 167776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-24 21:45:55 UTC (rev 167775)
+++ trunk/Source/WebCore/ChangeLog 2014-04-24 21:46:19 UTC (rev 167776)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-04-24 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] don't ask for AVAssetTrack properties before they are available
+ https://bugs.webkit.org/show_bug.cgi?id=131902
+ <rdar://problem/16505076>
+
+ Reviewed by Brent Fulgham.
+
+ No new tests, the behavior this changes can not be tested with a layout test.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC): Initialize
+ m_cachedTotalBytes.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata): Don't report that
+ metadata has been loaded until the track properties we need have been loaded too.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::totalBytes): Cache totalBytes instead
+ of recalculating it every time.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::tracksDidChange): Invalidate cached
+ total bytes.
+ (WebCore::assetTrackMetadataKeyNames): Array of AVAssetTrack properties we use.
+
</ins><span class="cx"> 2014-04-24 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Unify platformWidthForGlyph across OS X and iOS
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (167775 => 167776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-04-24 21:45:55 UTC (rev 167775)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-04-24 21:46:19 UTC (rev 167776)
</span><span class="lines">@@ -322,6 +322,7 @@
</span><span class="cx"> FloatSize m_cachedPresentationSize;
</span><span class="cx"> double m_cachedDuration;
</span><span class="cx"> double m_cachedRate;
</span><ins>+ mutable long long m_cachedTotalBytes;
</ins><span class="cx"> unsigned m_pendingStatusChanges;
</span><span class="cx"> int m_cachedItemStatus;
</span><span class="cx"> bool m_cachedLikelyToKeepUp;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (167775 => 167776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-04-24 21:45:55 UTC (rev 167775)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-04-24 21:46:19 UTC (rev 167776)
</span><span class="lines">@@ -294,6 +294,7 @@
</span><span class="cx">
</span><span class="cx"> static NSArray *assetMetadataKeyNames();
</span><span class="cx"> static NSArray *itemKVOProperties();
</span><ins>+static NSArray* assetTrackMetadataKeyNames();
</ins><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> static const char *boolString(bool val)
</span><span class="lines">@@ -365,6 +366,7 @@
</span><span class="cx"> , m_currentTextTrack(0)
</span><span class="cx"> , m_cachedDuration(MediaPlayer::invalidTime())
</span><span class="cx"> , m_cachedRate(0)
</span><ins>+ , m_cachedTotalBytes(0)
</ins><span class="cx"> , m_pendingStatusChanges(0)
</span><span class="cx"> , m_cachedItemStatus(MediaPlayerAVPlayerItemStatusDoesNotExist)
</span><span class="cx"> , m_cachedLikelyToKeepUp(false)
</span><span class="lines">@@ -784,9 +786,33 @@
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateAVFoundationObjC::beginLoadingMetadata(%p) - requesting metadata loading", this);
</span><del>- [m_avAsset.get() loadValuesAsynchronouslyForKeys:[assetMetadataKeyNames() retain] completionHandler:^{
- [m_objcObserver.get() metadataLoaded];
</del><ins>+
+ dispatch_group_t metadataLoadingGroup = dispatch_group_create();
+ dispatch_group_enter(metadataLoadingGroup);
+ auto weakThis = createWeakPtr();
+ [m_avAsset.get() loadValuesAsynchronouslyForKeys:assetMetadataKeyNames() completionHandler:^{
+
+ callOnMainThread([weakThis, metadataLoadingGroup] {
+ if (weakThis && [weakThis->m_avAsset.get() statusOfValueForKey:@"tracks" error:nil] == AVKeyValueStatusLoaded) {
+ for (AVAssetTrack *track in [weakThis->m_avAsset.get() tracks]) {
+ dispatch_group_enter(metadataLoadingGroup);
+ [track loadValuesAsynchronouslyForKeys:assetTrackMetadataKeyNames() completionHandler:^{
+ dispatch_group_leave(metadataLoadingGroup);
+ }];
+ }
+ }
+ dispatch_group_leave(metadataLoadingGroup);
+ });
</ins><span class="cx"> }];
</span><ins>+
+ dispatch_group_notify(metadataLoadingGroup, dispatch_get_main_queue(), ^{
+ callOnMainThread([weakThis] {
+ if (weakThis)
+ [weakThis->m_objcObserver.get() metadataLoaded];
+ });
+
+ dispatch_release(metadataLoadingGroup);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlayerPrivateAVFoundation::ItemStatus MediaPlayerPrivateAVFoundationObjC::playerItemStatus() const
</span><span class="lines">@@ -1131,11 +1157,13 @@
</span><span class="cx"> if (!metaDataAvailable())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- long long totalMediaSize = 0;
</del><ins>+ if (m_cachedTotalBytes)
+ return m_cachedTotalBytes;
+
</ins><span class="cx"> for (AVPlayerItemTrack *thisTrack in m_cachedTracks.get())
</span><del>- totalMediaSize += [[thisTrack assetTrack] totalSampleDataLength];
</del><ins>+ m_cachedTotalBytes += [[thisTrack assetTrack] totalSampleDataLength];
</ins><span class="cx">
</span><del>- return totalMediaSize;
</del><ins>+ return m_cachedTotalBytes;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::setAsset(id asset)
</span><span class="lines">@@ -2361,6 +2389,7 @@
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::tracksDidChange(RetainPtr<NSArray> tracks)
</span><span class="cx"> {
</span><span class="cx"> m_cachedTracks = tracks;
</span><ins>+ m_cachedTotalBytes = 0;
</ins><span class="cx">
</span><span class="cx"> tracksChanged();
</span><span class="cx"> updateStates();
</span><span class="lines">@@ -2442,6 +2471,13 @@
</span><span class="cx"> return keys;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+NSArray* assetTrackMetadataKeyNames()
+{
+ static NSArray* keys = [[NSArray alloc] initWithObjects:@"totalSampleDataLength", @"mediaType", nil];
+
+ return keys;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> @implementation WebCoreAVFMovieObserver
</span></span></pre>
</div>
</div>
</body>
</html>