<!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>[178289] trunk</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/178289">178289</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-12 12:02:32 -0800 (Mon, 12 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/178281">r178281</a>.
https://bugs.webkit.org/show_bug.cgi?id=140366
Broke many media tests (Requested by ap on #webkit).
Reverted changeset:
"defaultPlaybackRate not respected when set before source is
loaded"
https://bugs.webkit.org/show_bug.cgi?id=140282
http://trac.webkit.org/changeset/178281</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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="#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="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp</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>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideodefaultplaybackratebeforeloadexpectedtxt">trunk/LayoutTests/media/video-defaultplaybackrate-before-load-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideodefaultplaybackratebeforeloadhtml">trunk/LayoutTests/media/video-defaultplaybackrate-before-load.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/LayoutTests/ChangeLog 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-12 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r178281.
+ https://bugs.webkit.org/show_bug.cgi?id=140366
+
+ Broke many media tests (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "defaultPlaybackRate not respected when set before source is
+ loaded"
+ https://bugs.webkit.org/show_bug.cgi?id=140282
+ http://trac.webkit.org/changeset/178281
+
</ins><span class="cx"> 2015-01-12 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> defaultPlaybackRate not respected when set before source is loaded
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideodefaultplaybackratebeforeloadexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/video-defaultplaybackrate-before-load-expected.txt (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-defaultplaybackrate-before-load-expected.txt 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/LayoutTests/media/video-defaultplaybackrate-before-load-expected.txt 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-
-RUN(video.defaultPlaybackRate = 0.5)
-EVENT(canplaythrough)
-EXPECTED (video.playbackRate == '0.5') OK
-EXPECTED (video.defaultPlaybackRate == '0.5') OK
-EVENT(timeupdate)
-EVENT(timeupdate)
-EXPECTED (effectivePlaybackRate < '0.75') OK
-END OF TEST
-
</del></span></pre></div>
<a id="trunkLayoutTestsmediavideodefaultplaybackratebeforeloadhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/video-defaultplaybackrate-before-load.html (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-defaultplaybackrate-before-load.html 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/LayoutTests/media/video-defaultplaybackrate-before-load.html 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
- <head>
- <title>test playbackRate and defaultPlaybackRate</title>
- <script src=media-file.js></script>
- <script src=video-test.js></script>
- <script>
- var wallClockAtFirstTimeUpdate;
- var mediaTimeAtFirstTimeUpdate;
- var effectivePlaybackRate;
-
- function start()
- {
- findMediaElement();
- waitForEvent('canplaythrough', canplaythrough);
- run('video.defaultPlaybackRate = 0.5');
- setSrcByTagName('video', findMediaFile('video', 'content/test'));
- }
-
- function canplaythrough()
- {
- testExpected('video.playbackRate', 0.5);
- testExpected('video.defaultPlaybackRate', 0.5);
-
- waitForEvent('timeupdate', timeupdate);
- video.play();
- }
-
- function timeupdate()
- {
- var now = Date.now() / 1000;
- if (!wallClockAtFirstTimeUpdate) {
- wallClockAtFirstTimeUpdate = now;
- mediaTimeAtFirstTimeUpdate = video.currentTime;
- return;
- }
-
- if (wallClockAtFirstTimeUpdate == now)
- return;
-
- var wallClockDelta = wallClockAtFirstTimeUpdate - now;
- var mediaTimeDelta = mediaTimeAtFirstTimeUpdate - video.currentTime;
- effectivePlaybackRate = mediaTimeDelta / wallClockDelta;
-
- testExpected('effectivePlaybackRate', .75, '<');
- endTest();
- }
-
- </script>
- </head>
-
- <body onload="start()">
- <video controls></video>
- </body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/ChangeLog 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-12 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r178281.
+ https://bugs.webkit.org/show_bug.cgi?id=140366
+
+ Broke many media tests (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "defaultPlaybackRate not respected when set before source is
+ loaded"
+ https://bugs.webkit.org/show_bug.cgi?id=140282
+ http://trac.webkit.org/changeset/178281
+
</ins><span class="cx"> 2015-01-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge DatabaseBackendContext into DatabaseContext
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -262,9 +262,8 @@
</span><span class="cx"> , m_seekTimer(*this, &HTMLMediaElement::seekTimerFired)
</span><span class="cx"> , m_playedTimeRanges()
</span><span class="cx"> , m_asyncEventQueue(*this)
</span><del>- , m_requestedPlaybackRate(1)
- , m_reportedPlaybackRate(1)
- , m_defaultPlaybackRate(1)
</del><ins>+ , m_playbackRate(1.0f)
+ , m_defaultPlaybackRate(1.0f)
</ins><span class="cx"> , m_webkitPreservesPitch(true)
</span><span class="cx"> , m_networkState(NETWORK_EMPTY)
</span><span class="cx"> , m_readyState(HAVE_NOTHING)
</span><span class="lines">@@ -2654,17 +2653,12 @@
</span><span class="cx">
</span><span class="cx"> double HTMLMediaElement::effectivePlaybackRate() const
</span><span class="cx"> {
</span><del>- return m_mediaController ? m_mediaController->playbackRate() : m_reportedPlaybackRate;
</del><ins>+ return m_mediaController ? m_mediaController->playbackRate() : m_playbackRate;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-double HTMLMediaElement::requestedPlaybackRate() const
-{
- return m_mediaController ? m_mediaController->playbackRate() : m_requestedPlaybackRate;
-}
-
</del><span class="cx"> double HTMLMediaElement::playbackRate() const
</span><span class="cx"> {
</span><del>- return m_requestedPlaybackRate;
</del><ins>+ return m_playbackRate;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::setPlaybackRate(double rate)
</span><span class="lines">@@ -2674,8 +2668,8 @@
</span><span class="cx"> if (m_player && potentiallyPlaying() && m_player->rate() != rate && !m_mediaController)
</span><span class="cx"> m_player->setRate(rate);
</span><span class="cx">
</span><del>- if (m_requestedPlaybackRate != rate) {
- m_reportedPlaybackRate = m_requestedPlaybackRate = rate;
</del><ins>+ if (m_playbackRate != rate) {
+ m_playbackRate = rate;
</ins><span class="cx"> invalidateCachedTime();
</span><span class="cx"> scheduleEvent(eventNames().ratechangeEvent);
</span><span class="cx"> }
</span><span class="lines">@@ -2683,9 +2677,9 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::updatePlaybackRate()
</span><span class="cx"> {
</span><del>- double requestedRate = requestedPlaybackRate();
- if (m_player && potentiallyPlaying() && m_player->rate() != requestedRate)
- m_player->setRate(requestedRate);
</del><ins>+ double effectiveRate = effectivePlaybackRate();
+ if (m_player && potentiallyPlaying() && m_player->rate() != effectiveRate)
+ m_player->setRate(effectiveRate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::webkitPreservesPitch() const
</span><span class="lines">@@ -2710,7 +2704,7 @@
</span><span class="cx"> // 4.8.10.8 Playing the media resource
</span><span class="cx"> // The ended attribute must return true if the media element has ended
</span><span class="cx"> // playback and the direction of playback is forwards, and false otherwise.
</span><del>- return endedPlayback() && requestedPlaybackRate() > 0;
</del><ins>+ return endedPlayback() && effectivePlaybackRate() > 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::autoplay() const
</span><span class="lines">@@ -3147,7 +3141,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_player);
</span><span class="cx">
</span><del>- if (m_fragmentEndTime.isValid() && currentMediaTime() >= m_fragmentEndTime && requestedPlaybackRate() > 0) {
</del><ins>+ if (m_fragmentEndTime.isValid() && currentMediaTime() >= m_fragmentEndTime && effectivePlaybackRate() > 0) {
</ins><span class="cx"> m_fragmentEndTime = MediaTime::invalidTime();
</span><span class="cx"> if (!m_mediaController && !m_paused) {
</span><span class="cx"> // changes paused to true and fires a simple event named pause at the media element.
</span><span class="lines">@@ -4201,14 +4195,13 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::mediaPlayerRateChanged(MediaPlayer*)
</span><span class="cx"> {
</span><ins>+ LOG(Media, "HTMLMediaElement::mediaPlayerRateChanged(%p)", this);
+
</ins><span class="cx"> beginProcessingMediaPlayerCallback();
</span><span class="cx">
</span><span class="cx"> // Stash the rate in case the one we tried to set isn't what the engine is
</span><span class="cx"> // using (eg. it can't handle the rate we set)
</span><del>- m_reportedPlaybackRate = m_player->rate();
-
- LOG(Media, "HTMLMediaElement::mediaPlayerRateChanged(%p) - rate: %lf", this, m_reportedPlaybackRate);
-
</del><ins>+ m_playbackRate = m_player->rate();
</ins><span class="cx"> if (m_playing)
</span><span class="cx"> invalidateCachedTime();
</span><span class="cx">
</span><span class="lines">@@ -4440,12 +4433,12 @@
</span><span class="cx"> // of playback is forwards, Either the media element does not have a loop attribute specified,
</span><span class="cx"> // or the media element has a current media controller.
</span><span class="cx"> MediaTime now = currentMediaTime();
</span><del>- if (requestedPlaybackRate() > 0)
</del><ins>+ if (effectivePlaybackRate() > 0)
</ins><span class="cx"> return dur > MediaTime::zeroTime() && now >= dur && (!loop() || m_mediaController);
</span><span class="cx">
</span><span class="cx"> // or the current playback position is the earliest possible position and the direction
</span><span class="cx"> // of playback is backwards
</span><del>- if (requestedPlaybackRate() < 0)
</del><ins>+ if (effectivePlaybackRate() < 0)
</ins><span class="cx"> return now <= MediaTime::zeroTime();
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -4546,7 +4539,7 @@
</span><span class="cx">
</span><span class="cx"> // Set rate, muted before calling play in case they were set before the media engine was setup.
</span><span class="cx"> // The media engine should just stash the rate and muted values since it isn't already playing.
</span><del>- m_player->setRate(requestedPlaybackRate());
</del><ins>+ m_player->setRate(effectivePlaybackRate());
</ins><span class="cx"> m_player->setMuted(effectiveMuted());
</span><span class="cx">
</span><span class="cx"> if (m_firstTimePlaying) {
</span><span class="lines">@@ -5797,11 +5790,6 @@
</span><span class="cx"> diagnosticLoggingClient->logDiagnosticMessageWithValue(DiagnosticLoggingKeys::engineFailedToLoadKey(), engine, String::number(m_player->platformErrorCode()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double HTMLMediaElement::mediaPlayerRequestedPlaybackRate() const
-{
- return potentiallyPlaying() ? requestedPlaybackRate() : 0;
-}
-
</del><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 (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -532,7 +532,6 @@
</span><span class="cx"> void setNetworkState(MediaPlayer::NetworkState);
</span><span class="cx">
</span><span class="cx"> double effectivePlaybackRate() const;
</span><del>- double requestedPlaybackRate() const;
</del><span class="cx">
</span><span class="cx"> virtual void mediaPlayerNetworkStateChanged(MediaPlayer*) override;
</span><span class="cx"> virtual void mediaPlayerReadyStateChanged(MediaPlayer*) override;
</span><span class="lines">@@ -607,8 +606,6 @@
</span><span class="cx"> virtual bool mediaPlayerIsInMediaDocument() const override final;
</span><span class="cx"> virtual void mediaPlayerEngineFailedToLoad() const override final;
</span><span class="cx">
</span><del>- virtual double mediaPlayerRequestedPlaybackRate() const override final;
-
</del><span class="cx"> void loadTimerFired();
</span><span class="cx"> void progressEventTimerFired();
</span><span class="cx"> void playbackProgressTimerFired();
</span><span class="lines">@@ -748,8 +745,7 @@
</span><span class="cx"> RefPtr<TimeRanges> m_playedTimeRanges;
</span><span class="cx"> GenericEventQueue m_asyncEventQueue;
</span><span class="cx">
</span><del>- double m_requestedPlaybackRate;
- double m_reportedPlaybackRate;
</del><ins>+ double m_playbackRate;
</ins><span class="cx"> double m_defaultPlaybackRate;
</span><span class="cx"> bool m_webkitPreservesPitch;
</span><span class="cx"> NetworkState m_networkState;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -312,6 +312,7 @@
</span><span class="cx"> , m_currentMediaEngine(0)
</span><span class="cx"> , m_preload(Auto)
</span><span class="cx"> , m_visible(false)
</span><ins>+ , m_rate(1.0f)
</ins><span class="cx"> , m_volume(1.0f)
</span><span class="cx"> , m_muted(false)
</span><span class="cx"> , m_preservesPitch(true)
</span><span class="lines">@@ -678,19 +679,15 @@
</span><span class="cx">
</span><span class="cx"> double MediaPlayer::rate() const
</span><span class="cx"> {
</span><del>- return m_private->rate();
</del><ins>+ return m_rate;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayer::setRate(double rate)
</span><span class="cx"> {
</span><ins>+ m_rate = rate;
</ins><span class="cx"> m_private->setRateDouble(rate);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double MediaPlayer::requestedRate() const
-{
- return m_client.mediaPlayerRequestedPlaybackRate();
-}
-
</del><span class="cx"> bool MediaPlayer::preservesPitch() const
</span><span class="cx"> {
</span><span class="cx"> return m_preservesPitch;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -262,8 +262,6 @@
</span><span class="cx">
</span><span class="cx"> virtual bool mediaPlayerIsInMediaDocument() const { return false; }
</span><span class="cx"> virtual void mediaPlayerEngineFailedToLoad() const { }
</span><del>-
- virtual double mediaPlayerRequestedPlaybackRate() const { return 0; }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class MediaPlayerSupportsTypeClient {
</span><span class="lines">@@ -366,7 +364,6 @@
</span><span class="cx">
</span><span class="cx"> double rate() const;
</span><span class="cx"> void setRate(double);
</span><del>- double requestedRate() const;
</del><span class="cx">
</span><span class="cx"> bool preservesPitch() const;
</span><span class="cx"> void setPreservesPitch(bool);
</span><span class="lines">@@ -598,6 +595,7 @@
</span><span class="cx"> IntSize m_size;
</span><span class="cx"> Preload m_preload;
</span><span class="cx"> bool m_visible;
</span><ins>+ double m_rate;
</ins><span class="cx"> double m_volume;
</span><span class="cx"> bool m_muted;
</span><span class="cx"> bool m_preservesPitch;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -102,7 +102,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void setRate(float) { }
</span><span class="cx"> virtual void setRateDouble(double rate) { setRate(rate); }
</span><del>- virtual double rate() const { return 0; }
</del><span class="cx">
</span><span class="cx"> virtual void setPreservesPitch(bool) { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> , m_cachedDuration(MediaTime::invalidTime())
</span><span class="cx"> , m_reportedDuration(MediaTime::invalidTime())
</span><span class="cx"> , m_maxTimeLoadedAtLastDidLoadingProgress(MediaTime::invalidTime())
</span><ins>+ , m_requestedRate(1)
</ins><span class="cx"> , m_delayCallbacks(0)
</span><span class="cx"> , m_delayCharacteristicsChangedNotification(0)
</span><span class="cx"> , m_mainThreadCallPending(false)
</span><span class="lines">@@ -289,6 +290,14 @@
</span><span class="cx"> seekToTime(time, negativeTolerance, positiveTolerance);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateAVFoundation::setRate(float rate)
+{
+ LOG(Media, "MediaPlayerPrivateAVFoundation::setRate(%p) - seting to %f", this, rate);
+ m_requestedRate = rate;
+
+ updateRate();
+}
+
</ins><span class="cx"> bool MediaPlayerPrivateAVFoundation::paused() const
</span><span class="cx"> {
</span><span class="cx"> if (!metaDataAvailable())
</span><span class="lines">@@ -410,11 +419,6 @@
</span><span class="cx"> return m_cachedMinTimeSeekable;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double MediaPlayerPrivateAVFoundation::requestedRate() const
-{
- return m_player->requestedRate();
-}
-
</del><span class="cx"> MediaTime MediaPlayerPrivateAVFoundation::maxTimeLoaded() const
</span><span class="cx"> {
</span><span class="cx"> if (!metaDataAvailable())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -171,6 +171,7 @@
</span><span class="cx"> virtual void seek(const MediaTime&) override;
</span><span class="cx"> virtual void seekWithTolerance(const MediaTime&, const MediaTime&, const MediaTime&) override;
</span><span class="cx"> virtual bool seeking() const override;
</span><ins>+ virtual void setRate(float) override;
</ins><span class="cx"> virtual bool paused() const override;
</span><span class="cx"> virtual void setVolume(float) = 0;
</span><span class="cx"> virtual bool hasClosedCaptions() const override { return m_cachedHasCaptions; }
</span><span class="lines">@@ -231,6 +232,8 @@
</span><span class="cx"> virtual void platformPlay() = 0;
</span><span class="cx"> virtual void platformPause() = 0;
</span><span class="cx"> virtual void checkPlayability() = 0;
</span><ins>+ virtual void updateRate() = 0;
+ virtual float rate() const = 0;
</ins><span class="cx"> virtual void seekToTime(const MediaTime&, const MediaTime& negativeTolerance, const MediaTime& positiveTolerance) = 0;
</span><span class="cx"> virtual unsigned long long totalBytes() const = 0;
</span><span class="cx"> virtual std::unique_ptr<PlatformTimeRanges> platformBufferedTimeRanges() const = 0;
</span><span class="lines">@@ -274,7 +277,7 @@
</span><span class="cx"> MediaRenderingMode preferredRenderingMode() const;
</span><span class="cx">
</span><span class="cx"> bool metaDataAvailable() const { return m_readyState >= MediaPlayer::HaveMetadata; }
</span><del>- double requestedRate() const;
</del><ins>+ float requestedRate() const { return m_requestedRate; }
</ins><span class="cx"> MediaTime maxTimeLoaded() const;
</span><span class="cx"> bool isReadyForVideoSetup() const;
</span><span class="cx"> virtual void setUpVideoRendering();
</span><span class="lines">@@ -328,6 +331,7 @@
</span><span class="cx"> mutable MediaTime m_cachedDuration;
</span><span class="cx"> MediaTime m_reportedDuration;
</span><span class="cx"> mutable MediaTime m_maxTimeLoadedAtLastDidLoadingProgress;
</span><ins>+ float m_requestedRate;
</ins><span class="cx"> mutable int m_delayCallbacks;
</span><span class="cx"> int m_delayCharacteristicsChangedNotification;
</span><span class="cx"> bool m_mainThreadCallPending;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -643,24 +643,24 @@
</span><span class="cx"> AVCFPlayerSetClosedCaptionDisplayEnabled(avPlayer(m_avfWrapper), closedCaptionsVisible);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateAVFoundationCF::setRate(float rate)
</del><ins>+void MediaPlayerPrivateAVFoundationCF::updateRate()
</ins><span class="cx"> {
</span><del>- LOG(Media, "MediaPlayerPrivateAVFoundationCF::setRate(%p) - rate: %f", this, rate);
</del><ins>+ LOG(Media, "MediaPlayerPrivateAVFoundationCF::updateRate(%p)", this);
</ins><span class="cx"> if (!metaDataAvailable() || !avPlayer(m_avfWrapper))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> setDelayCallbacks(true);
</span><del>- AVCFPlayerSetRate(avPlayer(m_avfWrapper), rate);
</del><ins>+ AVCFPlayerSetRate(avPlayer(m_avfWrapper), requestedRate());
</ins><span class="cx"> setDelayCallbacks(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double MediaPlayerPrivateAVFoundationCF::rate() const
</del><ins>+float MediaPlayerPrivateAVFoundationCF::rate() const
</ins><span class="cx"> {
</span><span class="cx"> if (!metaDataAvailable() || !avPlayer(m_avfWrapper))
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> setDelayCallbacks(true);
</span><del>- double currentRate = AVCFPlayerGetRate(avPlayer(m_avfWrapper));
</del><ins>+ float currentRate = AVCFPlayerGetRate(avPlayer(m_avfWrapper));
</ins><span class="cx"> setDelayCallbacks(false);
</span><span class="cx">
</span><span class="cx"> return currentRate;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -90,8 +90,8 @@
</span><span class="cx"> virtual MediaPlayerPrivateAVFoundation::AssetStatus assetStatus() const;
</span><span class="cx">
</span><span class="cx"> virtual void checkPlayability();
</span><del>- virtual void setRate(float) override;
- virtual double rate() const override;
</del><ins>+ virtual void updateRate();
+ virtual float rate() const;
</ins><span class="cx"> virtual void seekToTime(const MediaTime&, const MediaTime& negativeTolerance, const MediaTime& positiveTolerance);
</span><span class="cx"> virtual unsigned long long totalBytes() const;
</span><span class="cx"> virtual std::unique_ptr<PlatformTimeRanges> platformBufferedTimeRanges() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -177,8 +177,8 @@
</span><span class="cx"> virtual long assetErrorCode() const;
</span><span class="cx">
</span><span class="cx"> virtual void checkPlayability();
</span><del>- virtual void setRateDouble(double) override;
- virtual double rate() const;
</del><ins>+ virtual void updateRate();
+ virtual float rate() const;
</ins><span class="cx"> virtual void seekToTime(const MediaTime&, const MediaTime& negativeTolerance, const MediaTime& positiveTolerance);
</span><span class="cx"> virtual unsigned long long totalBytes() const;
</span><span class="cx"> virtual std::unique_ptr<PlatformTimeRanges> platformBufferedTimeRanges() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -1253,16 +1253,15 @@
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setClosedCaptionsVisible(%p) - set to %s", this, boolString(closedCaptionsVisible));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateAVFoundationObjC::setRateDouble(double rate)
-
</del><ins>+void MediaPlayerPrivateAVFoundationObjC::updateRate()
</ins><span class="cx"> {
</span><span class="cx"> setDelayCallbacks(true);
</span><del>- m_cachedRate = rate;
- [m_avPlayer.get() setRate:rate];
</del><ins>+ m_cachedRate = requestedRate();
+ [m_avPlayer.get() setRate:requestedRate()];
</ins><span class="cx"> setDelayCallbacks(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double MediaPlayerPrivateAVFoundationObjC::rate() const
</del><ins>+float MediaPlayerPrivateAVFoundationObjC::rate() const
</ins><span class="cx"> {
</span><span class="cx"> if (!metaDataAvailable())
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -104,7 +104,6 @@
</span><span class="cx"> virtual void seek(const MediaTime&) override;
</span><span class="cx">
</span><span class="cx"> void setRate(float);
</span><del>- virtual double rate() const override;
</del><span class="cx"> void setVolume(float);
</span><span class="cx"> void setPreservesPitch(bool);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (178288 => 178289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-01-12 19:43:31 UTC (rev 178288)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-01-12 20:02:32 UTC (rev 178289)
</span><span class="lines">@@ -792,11 +792,6 @@
</span><span class="cx"> [m_qtMovie.get() setRate:rate];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double MediaPlayerPrivateQTKit::rate() const
-{
- return m_qtMovie ? [m_qtMovie rate] : 0;
-}
-
</del><span class="cx"> void MediaPlayerPrivateQTKit::setPreservesPitch(bool preservesPitch)
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateQTKit::setPreservesPitch(%p) - preservesPitch %d", this, (int)preservesPitch);
</span></span></pre>
</div>
</div>
</body>
</html>