<!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>[176002] 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/176002">176002</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-11-11 20:29:54 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Add diagnostic logging for per-media-engine load failures
https://bugs.webkit.org/show_bug.cgi?id=138647
Reviewed by Eric Carlson.
Add diagnostic logging fired whenever a media engine fails to load media,
even if another engine subsequentially succeeds. Add a mechanism for retrieving
the platform-specific error code from a given engine.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* html/HTMLMediaElement.h:
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::engineFailedToLoadKey):
* page/DiagnosticLoggingKeys.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::networkStateChanged):
(WebCore::MediaPlayer::platformErrorCode):
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::mediaPlayerEngineFailedToLoad):
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::platformErrorCode):
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
(WebCore::MediaPlayerPrivateAVFoundation::platformErrorCode):
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::MediaPlayerPrivateAVFoundationCF::assetErrorCode):
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::assetErrorCode):
* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::platformErrorCode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeyscpp">trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeysh">trunk/Source/WebCore/page/DiagnosticLoggingKeys.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFh">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h</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>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/ChangeLog 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-11-11 Jer Noble <jer.noble@apple.com>
+
+ [Mac] Add diagnostic logging for per-media-engine load failures
+ https://bugs.webkit.org/show_bug.cgi?id=138647
+
+ Reviewed by Eric Carlson.
+
+ Add diagnostic logging fired whenever a media engine fails to load media,
+ even if another engine subsequentially succeeds. Add a mechanism for retrieving
+ the platform-specific error code from a given engine.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * html/HTMLMediaElement.h:
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::engineFailedToLoadKey):
+ * page/DiagnosticLoggingKeys.h:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::networkStateChanged):
+ (WebCore::MediaPlayer::platformErrorCode):
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::mediaPlayerEngineFailedToLoad):
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::platformErrorCode):
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ (WebCore::MediaPlayerPrivateAVFoundation::platformErrorCode):
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::assetErrorCode):
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::assetErrorCode):
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::platformErrorCode):
+
</ins><span class="cx"> 2014-11-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark more virtual functions in HTMLInputElement as final
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -5762,6 +5762,20 @@
</span><span class="cx"> return document().isMediaDocument();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLMediaElement::mediaPlayerEngineFailedToLoad() const
+{
+ if (!m_player)
+ return;
+
+ Page* page = document().page();
+ if (!page || !page->settings().diagnosticLoggingEnabled())
+ return;
+
+ String engine = m_player->engineDescription();
+ String message = String::number(m_player->platformErrorCode());
+ page->chrome().client().logDiagnosticMessage(DiagnosticLoggingKeys::engineFailedToLoadKey(), engine, message);
+}
+
</ins><span class="cx"> void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture()
</span><span class="cx"> {
</span><span class="cx"> m_mediaSession->removeBehaviorRestriction(HTMLMediaSession::RequireUserGestureForLoad);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -592,6 +592,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual bool mediaPlayerIsInMediaDocument() const override final;
</span><ins>+ virtual void mediaPlayerEngineFailedToLoad() const override final;
</ins><span class="cx">
</span><span class="cx"> void loadTimerFired(Timer&);
</span><span class="cx"> void progressEventTimerFired(Timer&);
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -88,4 +88,10 @@
</span><span class="cx"> return WTF::ASCIILiteral("pageLoaded");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::engineFailedToLoadKey()
+{
+ return WTF::ASCIILiteral("engineFailedToLoad");
</ins><span class="cx"> }
</span><ins>+
+}
+
</ins></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> static String pageContainsMediaEngineKey();
</span><span class="cx"> static String pageContainsAtLeastOneMediaEngineKey();
</span><span class="cx"> static String pageLoadedKey();
</span><ins>+ static String engineFailedToLoadKey();
</ins><span class="cx">
</span><span class="cx"> // Success keys.
</span><span class="cx"> static String passKey();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -1014,10 +1014,9 @@
</span><span class="cx"> {
</span><span class="cx"> // If more than one media engine is installed and this one failed before finding metadata,
</span><span class="cx"> // let the next engine try.
</span><del>- if (m_private->networkState() >= FormatError
- && m_private->readyState() < HaveMetadata
- && installedMediaEngines().size() > 1) {
- if (m_contentMIMEType.isEmpty() || nextBestMediaEngine(m_currentMediaEngine)) {
</del><ins>+ if (m_private->networkState() >= FormatError && m_private->readyState() < HaveMetadata) {
+ m_client.mediaPlayerEngineFailedToLoad();
+ if (installedMediaEngines().size() > 1 && (m_contentMIMEType.isEmpty() || nextBestMediaEngine(m_currentMediaEngine))) {
</ins><span class="cx"> m_reloadTimer.startOneShot(0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1146,6 +1145,14 @@
</span><span class="cx"> return m_private->engineDescription();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+long MediaPlayer::platformErrorCode() const
+{
+ if (!m_private)
+ return 0;
+
+ return m_private->platformErrorCode();
+}
+
</ins><span class="cx"> #if PLATFORM(WIN) && USE(AVFOUNDATION)
</span><span class="cx"> GraphicsDeviceAdapter* MediaPlayer::graphicsDeviceAdapter() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -261,6 +261,7 @@
</span><span class="cx"> virtual String mediaPlayerSourceApplicationIdentifier() const { return emptyString(); }
</span><span class="cx">
</span><span class="cx"> virtual bool mediaPlayerIsInMediaDocument() const { return false; }
</span><ins>+ virtual void mediaPlayerEngineFailedToLoad() const { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class MediaPlayerSupportsTypeClient {
</span><span class="lines">@@ -520,6 +521,7 @@
</span><span class="cx"> String userAgent() const;
</span><span class="cx">
</span><span class="cx"> String engineDescription() const;
</span><ins>+ long platformErrorCode() const;
</ins><span class="cx">
</span><span class="cx"> CachedResourceLoader* cachedResourceLoader();
</span><span class="cx"> PassRefPtr<PlatformMediaResourceLoader> createResourceLoader(std::unique_ptr<PlatformMediaResourceLoaderClient>);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> virtual String accessLog() const { return emptyString(); }
</span><span class="cx"> virtual String errorLog() const { return emptyString(); }
</span><span class="cx"> #endif
</span><ins>+ virtual long platformErrorCode() const { return 0; }
</ins><span class="cx">
</span><span class="cx"> virtual void play() = 0;
</span><span class="cx"> virtual void pause() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -225,6 +225,7 @@
</span><span class="cx"> MediaPlayerAVAssetStatusPlayable,
</span><span class="cx"> };
</span><span class="cx"> virtual AssetStatus assetStatus() const = 0;
</span><ins>+ virtual long assetErrorCode() const = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void platformSetVisible(bool) = 0;
</span><span class="cx"> virtual void platformPlay() = 0;
</span><span class="lines">@@ -291,6 +292,7 @@
</span><span class="cx"> MediaPlayer* player() { return m_player; }
</span><span class="cx">
</span><span class="cx"> virtual String engineDescription() const { return "AVFoundation"; }
</span><ins>+ virtual long platformErrorCode() const { return assetErrorCode(); }
</ins><span class="cx">
</span><span class="cx"> virtual void trackModeChanged() override;
</span><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -1133,6 +1133,21 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+long MediaPlayerPrivateAVFoundationCF::assetErrorCode() const
+{
+ if (!avAsset(m_avfWrapper))
+ return 0;
+
+ CFErrorRef error = nullptr;
+ AVCFAssetGetStatusOfValueForProperty(avAsset(m_avfWrapper), AVCFAssetPropertyPlayable, &error);
+ if (!error)
+ return 0;
+
+ long code = CFErrorGetCode(error);
+ CFRelease(error);
+ return code;
+}
+
</ins><span class="cx"> #if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
</span><span class="cx"> void MediaPlayerPrivateAVFoundationCF::processLegacyClosedCaptionsTracks()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -131,6 +131,8 @@
</span><span class="cx"> virtual void setCurrentTextTrack(InbandTextTrackPrivateAVF*) override;
</span><span class="cx"> virtual InbandTextTrackPrivateAVF* currentTextTrack() const override;
</span><span class="cx">
</span><ins>+ virtual long assetErrorCode() const override final;
+
</ins><span class="cx"> #if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
</span><span class="cx"> void processLegacyClosedCaptionsTracks();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -174,6 +174,7 @@
</span><span class="cx"> virtual void createAVAssetForURL(const String& url);
</span><span class="cx"> virtual MediaPlayerPrivateAVFoundation::ItemStatus playerItemStatus() const;
</span><span class="cx"> virtual MediaPlayerPrivateAVFoundation::AssetStatus assetStatus() const;
</span><ins>+ virtual long assetErrorCode() const;
</ins><span class="cx">
</span><span class="cx"> virtual void checkPlayability();
</span><span class="cx"> virtual void updateRate();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -1396,6 +1396,16 @@
</span><span class="cx"> return MediaPlayerAVAssetStatusLoaded;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+long MediaPlayerPrivateAVFoundationObjC::assetErrorCode() const
+{
+ if (!m_avAsset)
+ return 0;
+
+ NSError *error = nil;
+ [m_avAsset statusOfValueForKey:@"playable" error:&error];
+ return [error code];
+}
+
</ins><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::paintCurrentFrameInContext(GraphicsContext* context, const IntRect& rect)
</span><span class="cx"> {
</span><span class="cx"> if (!metaDataAvailable() || context->paintingDisabled())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -173,6 +173,7 @@
</span><span class="cx"> NSMutableDictionary* commonMovieAttributes();
</span><span class="cx">
</span><span class="cx"> virtual String engineDescription() const { return "QTKit"; }
</span><ins>+ virtual long platformErrorCode() const;
</ins><span class="cx">
</span><span class="cx"> MediaPlayer* m_player;
</span><span class="cx"> RetainPtr<QTMovie> m_qtMovie;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (176001 => 176002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-11-12 04:17:18 UTC (rev 176001)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-11-12 04:29:54 UTC (rev 176002)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> SOFT_LINK_POINTER(QTKit, QTMovieHasAudioAttribute, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(QTKit, QTMovieIsActiveAttribute, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(QTKit, QTMovieLoadStateAttribute, NSString *)
</span><ins>+SOFT_LINK_POINTER(QTKit, QTMovieLoadStateErrorAttribute, NSString *)
</ins><span class="cx"> SOFT_LINK_POINTER(QTKit, QTMovieLoadStateDidChangeNotification, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(QTKit, QTMovieNaturalSizeAttribute, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(QTKit, QTMovieCurrentSizeAttribute, NSString *)
</span><span class="lines">@@ -111,6 +112,7 @@
</span><span class="cx"> #define QTMovieHasAudioAttribute getQTMovieHasAudioAttribute()
</span><span class="cx"> #define QTMovieIsActiveAttribute getQTMovieIsActiveAttribute()
</span><span class="cx"> #define QTMovieLoadStateAttribute getQTMovieLoadStateAttribute()
</span><ins>+#define QTMovieLoadStateErrorAttribute getQTMovieLoadStateErrorAttribute()
</ins><span class="cx"> #define QTMovieLoadStateDidChangeNotification getQTMovieLoadStateDidChangeNotification()
</span><span class="cx"> #define QTMovieNaturalSizeAttribute getQTMovieNaturalSizeAttribute()
</span><span class="cx"> #define QTMovieCurrentSizeAttribute getQTMovieCurrentSizeAttribute()
</span><span class="lines">@@ -1053,6 +1055,18 @@
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateQTKit::updateStates(%p) - exiting with networkState = %i, readyState = %i", this, static_cast<int>(m_networkState), static_cast<int>(m_readyState));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+long MediaPlayerPrivateQTKit::platformErrorCode() const
+{
+ if (!m_qtMovie)
+ return 0;
+
+ NSError* error = (NSError*)[m_qtMovie attributeForKey:QTMovieLoadStateErrorAttribute];
+ if (!error || ![error isKindOfClass:[NSError class]])
+ return 0;
+
+ return [error code];
+}
+
</ins><span class="cx"> void MediaPlayerPrivateQTKit::loadStateChanged()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateQTKit::loadStateChanged(%p) - loadState = %li", this, [[m_qtMovie.get() attributeForKey:QTMovieLoadStateAttribute] longValue]);
</span></span></pre>
</div>
</div>
</body>
</html>