<!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>[164680] branches/safari-537.75-branch/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/164680">164680</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-02-25 16:12:01 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/164660">r164660</a>
2014-02-25 Brent Fulgham <bfulgham@apple.com>
[Win] Gracefully recover from missing 'naturalSize' parameter for media
https://bugs.webkit.org/show_bug.cgi?id=129278
Reviewed by Eric Carlson.
* platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h: Add declaration for
missing function call.
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::createMetadataKeyNames):
(WebCore::MediaPlayerPrivateAVFoundationCF::assetStatus): Don't treat missing 'naturalSize'
as a fatal error.
(WebCore::MediaPlayerPrivateAVFoundationCF::tracksChanged): Handle case of asset track
not being available yet.
(WebCore::MediaPlayerPrivateAVFoundationCF::sizeChanged): If the 'naturalSize' is empty,
use the Player Item's 'presentationSize' instead.
(WebCore::AVFWrapper::processNotification): Add missing handler for duration changed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchSourceWebCoreChangeLog">branches/safari-537.75-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreplatformgraphicsavfoundationcfAVFoundationCFSoftLinkingh">branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (164679 => 164680)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-25 23:53:41 UTC (rev 164679)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-26 00:12:01 UTC (rev 164680)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-02-25 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r164660
+
+ 2014-02-25 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Gracefully recover from missing 'naturalSize' parameter for media
+ https://bugs.webkit.org/show_bug.cgi?id=129278
+
+ Reviewed by Eric Carlson.
+
+ * platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h: Add declaration for
+ missing function call.
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::createMetadataKeyNames):
+ (WebCore::MediaPlayerPrivateAVFoundationCF::assetStatus): Don't treat missing 'naturalSize'
+ as a fatal error.
+ (WebCore::MediaPlayerPrivateAVFoundationCF::tracksChanged): Handle case of asset track
+ not being available yet.
+ (WebCore::MediaPlayerPrivateAVFoundationCF::sizeChanged): If the 'naturalSize' is empty,
+ use the Player Item's 'presentationSize' instead.
+ (WebCore::AVFWrapper::processNotification): Add missing handler for duration changed.
+
</ins><span class="cx"> 2014-02-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r163579.
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreplatformgraphicsavfoundationcfAVFoundationCFSoftLinkingh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h (164679 => 164680)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h 2014-02-25 23:53:41 UTC (rev 164679)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h 2014-02-26 00:12:01 UTC (rev 164680)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -149,6 +149,9 @@
</span><span class="cx"> SOFT_LINK_DLL_IMPORT(AVFoundationCF, AVCFPlayerItemGetDuration, CMTime, __cdecl, (AVCFPlayerItemRef playerItem), (playerItem))
</span><span class="cx"> #define AVCFPlayerItemGetDuration softLink_AVCFPlayerItemGetDuration
</span><span class="cx">
</span><ins>+SOFT_LINK_DLL_IMPORT(AVFoundationCF, AVCFPlayerItemGetPresentationSize, CGSize, __cdecl, (AVCFPlayerItemRef playerItem), (playerItem))
+#define AVCFPlayerItemGetPresentationSize softLink_AVCFPlayerItemGetPresentationSize
+
</ins><span class="cx"> SOFT_LINK_DLL_IMPORT(AVFoundationCF, AVCFPlayerItemGetStatus, AVCFPlayerItemStatus, __cdecl, (AVCFPlayerItemRef playerItem, CFErrorRef *errorOut), (playerItem, errorOut))
</span><span class="cx"> #define AVCFPlayerItemGetStatus softLink_AVCFPlayerItemGetStatus
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (164679 => 164680)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-02-25 23:53:41 UTC (rev 164679)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-02-26 00:12:01 UTC (rev 164680)
</span><span class="lines">@@ -209,7 +209,9 @@
</span><span class="cx"> AVCFAssetPropertyPreferredRate,
</span><span class="cx"> AVCFAssetPropertyPlayable,
</span><span class="cx"> AVCFAssetPropertyTracks,
</span><del>- AVCFAssetPropertyAvailableMediaCharacteristicsWithMediaSelectionOptions
</del><ins>+#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
+ AVCFAssetPropertyAvailableMediaCharacteristicsWithMediaSelectionOptions,
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> return CFArrayCreate(0, (const void**)keyNames, sizeof(keyNames) / sizeof(keyNames[0]), &kCFTypeArrayCallBacks);
</span><span class="lines">@@ -736,8 +738,21 @@
</span><span class="cx">
</span><span class="cx"> if (keyStatus < AVCFPropertyValueStatusLoaded)
</span><span class="cx"> return MediaPlayerAVAssetStatusLoading;
</span><del>- if (keyStatus == AVCFPropertyValueStatusFailed)
</del><ins>+ if (keyStatus == AVCFPropertyValueStatusFailed) {
+ if (CFStringCompare(keyName, AVCFAssetPropertyNaturalSize, 0) == kCFCompareEqualTo) {
+ // Don't treat a failure to retrieve @"naturalSize" as fatal. We will use @"presentationSize" instead.
+ // <rdar://problem/15966685>
+ continue;
+ }
+#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
+ if (CFStringCompare(keyName, AVCFAssetPropertyAvailableMediaCharacteristicsWithMediaSelectionOptions, 0) == kCFCompareEqualTo) {
+ // On Windows, the media selection options are not available when initially interacting with a streaming source.
+ // <rdar://problem/16160699>
+ continue;
+ }
+#endif
</ins><span class="cx"> return MediaPlayerAVAssetStatusFailed;
</span><ins>+ }
</ins><span class="cx"> if (keyStatus == AVCFPropertyValueStatusCancelled)
</span><span class="cx"> return MediaPlayerAVAssetStatusCancelled;
</span><span class="cx"> }
</span><span class="lines">@@ -878,6 +893,11 @@
</span><span class="cx">
</span><span class="cx"> if (AVCFPlayerItemTrackIsEnabled(track)) {
</span><span class="cx"> RetainPtr<AVCFAssetTrackRef> assetTrack = adoptCF(AVCFPlayerItemTrackCopyAssetTrack(track));
</span><ins>+ if (!assetTrack) {
+ // Asset tracks may not be available yet when streaming. <rdar://problem/16160699>
+ LOG(Media, "MediaPlayerPrivateAVFoundationCF:tracksChanged(%p) - track = %d is enabled, but has no asset track.", this, track);
+ continue;
+ }
</ins><span class="cx"> CFStringRef mediaType = AVCFAssetTrackGetMediaType(assetTrack.get());
</span><span class="cx"> if (!mediaType)
</span><span class="cx"> continue;
</span><span class="lines">@@ -948,6 +968,9 @@
</span><span class="cx"> trackRectUnion = CGRectOffset(trackRectUnion, trackRectUnion.origin.x, trackRectUnion.origin.y);
</span><span class="cx"> CGSize naturalSize = trackRectUnion.size;
</span><span class="cx">
</span><ins>+ if (!naturalSize.height && !naturalSize.width && avPlayerItem(m_avfWrapper))
+ naturalSize = AVCFPlayerItemGetPresentationSize(avPlayerItem(m_avfWrapper));
+
</ins><span class="cx"> // Also look at the asset's preferred transform so we account for a movie matrix.
</span><span class="cx"> CGSize movieSize = CGSizeApplyAffineTransform(AVCFAssetGetNaturalSize(avAsset(m_avfWrapper)), AVCFAssetGetPreferredTransform(avAsset(m_avfWrapper)));
</span><span class="cx"> if (movieSize.width > naturalSize.width)
</span><span class="lines">@@ -971,7 +994,9 @@
</span><span class="cx"> #if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
</span><span class="cx"> void MediaPlayerPrivateAVFoundationCF::processLegacyClosedCaptionsTracks()
</span><span class="cx"> {
</span><ins>+#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
</ins><span class="cx"> AVCFPlayerItemSelectMediaOptionInMediaSelectionGroup(avPlayerItem(m_avfWrapper), 0, safeMediaSelectionGroupForLegibleMedia(m_avfWrapper));
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<InbandTextTrackPrivateAVF> > removedTextTracks = m_textTracks;
</span><span class="cx"> RetainPtr<CFArrayRef> tracks = adoptCF(AVCFPlayerItemCopyTracks(avPlayerItem(m_avfWrapper)));
</span><span class="lines">@@ -980,6 +1005,11 @@
</span><span class="cx"> AVCFPlayerItemTrackRef playerItemTrack = (AVCFPlayerItemTrackRef)(CFArrayGetValueAtIndex(tracks.get(), i));
</span><span class="cx">
</span><span class="cx"> RetainPtr<AVCFAssetTrackRef> assetTrack = adoptCF(AVCFPlayerItemTrackCopyAssetTrack(playerItemTrack));
</span><ins>+ if (!assetTrack) {
+ // Asset tracks may not be available yet when streaming. <rdar://problem/16160699>
+ LOG(Media, "MediaPlayerPrivateAVFoundationCF:tracksChanged(%p) - track = %d is enabled, but has no asset track.", this, track);
+ continue;
+ }
</ins><span class="cx"> CFStringRef mediaType = AVCFAssetTrackGetMediaType(assetTrack.get());
</span><span class="cx"> if (!mediaType)
</span><span class="cx"> continue;
</span><span class="lines">@@ -1295,8 +1325,11 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(dispatch_get_main_queue() == dispatch_get_current_queue());
</span><del>- ASSERT(!avPlayer() && avPlayerItem());
</del><ins>+ ASSERT(avPlayerItem());
</ins><span class="cx">
</span><ins>+ if (avPlayer())
+ return;
+
</ins><span class="cx"> RetainPtr<CFMutableDictionaryRef> optionsRef = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</span><span class="cx">
</span><span class="cx"> if (d3dDevice) {
</span><span class="lines">@@ -1338,8 +1371,11 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(dispatch_get_main_queue() == dispatch_get_current_queue());
</span><del>- ASSERT(!avPlayerItem() && avAsset());
</del><ins>+ ASSERT(avAsset());
</ins><span class="cx">
</span><ins>+ if (avPlayerItem())
+ return;
+
</ins><span class="cx"> // Create the player item so we begin loading media data.
</span><span class="cx"> AVCFPlayerItemRef itemRef = AVCFPlayerItemCreateWithAsset(kCFAllocatorDefault, avAsset(), m_notificationQueue);
</span><span class="cx"> m_avPlayerItem = adoptCF(itemRef);
</span><span class="lines">@@ -1447,6 +1483,8 @@
</span><span class="cx"> self->m_owner->scheduleMainThreadNotification(MediaPlayerPrivateAVFoundation::Notification::PlayerRateChanged);
</span><span class="cx"> else if (CFEqual(propertyName, CACFContextNeedsFlushNotification()))
</span><span class="cx"> self->m_owner->scheduleMainThreadNotification(MediaPlayerPrivateAVFoundation::Notification::ContentsNeedsDisplay);
</span><ins>+ else if (CFEqual(propertyName, AVCFPlayerItemDurationChangedNotification))
+ self->m_owner->scheduleMainThreadNotification(MediaPlayerPrivateAVFoundation::Notification::DurationChanged);
</ins><span class="cx"> else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="lines">@@ -1532,6 +1570,7 @@
</span><span class="cx"> kCMTimeZero, kCMTimeZero, &seekCompletedCallback, callbackContext());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP) && HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
</ins><span class="cx"> struct LegibleOutputData {
</span><span class="cx"> RetainPtr<CFArrayRef> m_attributedStrings;
</span><span class="cx"> double m_time;
</span><span class="lines">@@ -1584,6 +1623,7 @@
</span><span class="cx">
</span><span class="cx"> dispatch_async_f(dispatch_get_main_queue(), legibleOutputData.leakPtr(), processCue);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void AVFWrapper::setAsset(AVCFURLAssetRef asset)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>