<!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>[170438] 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/170438">170438</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-06-25 14:32:49 -0700 (Wed, 25 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MSE][Mac] Pause playback when readyState drops below HAVE_FUTURE_DATA, and do not complete seek until it rises above HAVE_METADATA.
https://bugs.webkit.org/show_bug.cgi?id=134306
Reviewed by Eric Carlson.
Pause the synchronizer before seeking, and do not resume the synchronizer until it both reports that the seek completed,
and that the readyState rises above HAVE_METADATA. In every other location where we change the rate of the synchronizer,
gate that rate change on the above.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::MediaPlayerPrivateMediaSourceAVFObjC): Check shouldBePlaying().
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::playInternal): Ditto.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekWithTolerance): Unset m_seekCompleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekInternal): Pause the synchronizer.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setRateDouble): Check shouldBePlaying().
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::shouldBePlaying): Test m_seeking, !m_seekCompleted, and the readyState.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setReadyState): Set m_seekCompleted; check shouldBePlaying() and play if appropriate.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170437 => 170438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-25 21:31:35 UTC (rev 170437)
+++ trunk/Source/WebCore/ChangeLog 2014-06-25 21:32:49 UTC (rev 170438)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-06-25 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><ins>+ [MSE][Mac] Pause playback when readyState drops below HAVE_FUTURE_DATA, and do not complete seek until it rises above HAVE_METADATA.
+ https://bugs.webkit.org/show_bug.cgi?id=134306
+
+ Reviewed by Eric Carlson.
+
+ Pause the synchronizer before seeking, and do not resume the synchronizer until it both reports that the seek completed,
+ and that the readyState rises above HAVE_METADATA. In every other location where we change the rate of the synchronizer,
+ gate that rate change on the above.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::MediaPlayerPrivateMediaSourceAVFObjC): Check shouldBePlaying().
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::playInternal): Ditto.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekWithTolerance): Unset m_seekCompleted.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekInternal): Pause the synchronizer.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setRateDouble): Check shouldBePlaying().
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::shouldBePlaying): Test m_seeking, !m_seekCompleted, and the readyState.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setReadyState): Set m_seekCompleted; check shouldBePlaying() and play if appropriate.
+
+2014-06-25 Jer Noble <jer.noble@apple.com>
+
</ins><span class="cx"> [MSE] Update monitorSourceBuffers to match recent spec changes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134305
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (170437 => 170438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2014-06-25 21:31:35 UTC (rev 170437)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2014-06-25 21:32:49 UTC (rev 170438)
</span><span class="lines">@@ -156,6 +156,7 @@
</span><span class="cx">
</span><span class="cx"> void ensureLayer();
</span><span class="cx"> void destroyLayer();
</span><ins>+ bool shouldBePlaying() const;
</ins><span class="cx">
</span><span class="cx"> // MediaPlayer Factory Methods
</span><span class="cx"> static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
</span><span class="lines">@@ -194,6 +195,7 @@
</span><span class="cx"> double m_rate;
</span><span class="cx"> bool m_playing;
</span><span class="cx"> bool m_seeking;
</span><ins>+ bool m_seekCompleted;
</ins><span class="cx"> mutable bool m_loadingProgressed;
</span><span class="cx"> bool m_hasAvailableVideoFrame;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (170437 => 170438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-06-25 21:31:35 UTC (rev 170437)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-06-25 21:32:49 UTC (rev 170438)
</span><span class="lines">@@ -139,6 +139,7 @@
</span><span class="cx"> , m_rate(1)
</span><span class="cx"> , m_playing(0)
</span><span class="cx"> , m_seeking(false)
</span><ins>+ , m_seekCompleted(true)
</ins><span class="cx"> , m_loadingProgressed(false)
</span><span class="cx"> {
</span><span class="cx"> CMTimebaseRef timebase = [m_synchronizer timebase];
</span><span class="lines">@@ -153,8 +154,12 @@
</span><span class="cx"> if (!weakThis)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_seeking && !m_pendingSeek)
</del><ins>+ if (m_seeking && !m_pendingSeek) {
</ins><span class="cx"> m_seeking = false;
</span><ins>+ if (shouldBePlaying())
+ [m_synchronizer setRate:m_rate];
+ }
+
</ins><span class="cx"> m_player->timeChanged();
</span><span class="cx">
</span><span class="cx"> if (m_pendingSeek)
</span><span class="lines">@@ -328,7 +333,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_playing = true;
</span><del>- [m_synchronizer setRate:m_rate];
</del><ins>+ if (shouldBePlaying())
+ [m_synchronizer setRate:m_rate];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaSourceAVFObjC::pause()
</span><span class="lines">@@ -426,6 +432,7 @@
</span><span class="cx"> void MediaPlayerPrivateMediaSourceAVFObjC::seekWithTolerance(double time, double negativeThreshold, double positiveThreshold)
</span><span class="cx"> {
</span><span class="cx"> m_seeking = true;
</span><ins>+ m_seekCompleted = false;
</ins><span class="cx"> auto weakThis = createWeakPtr();
</span><span class="cx"> m_pendingSeek = std::make_unique<PendingSeek>(MediaTime::createWithDouble(time), MediaTime::createWithDouble(negativeThreshold), MediaTime::createWithDouble(positiveThreshold));
</span><span class="cx">
</span><span class="lines">@@ -453,19 +460,19 @@
</span><span class="cx"> else
</span><span class="cx"> seekTime = m_mediaSourcePrivate->fastSeekTimeForMediaTime(pendingSeek->targetTime, pendingSeek->positiveThreshold, pendingSeek->negativeThreshold);
</span><span class="cx">
</span><del>- [m_synchronizer setRate:(m_playing ? m_rate : 0) time:toCMTime(seekTime)];
</del><ins>+ [m_synchronizer setRate:0 time:toCMTime(seekTime)];
</ins><span class="cx"> m_mediaSourcePrivate->seekToTime(seekTime);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateMediaSourceAVFObjC::seeking() const
</span><span class="cx"> {
</span><del>- return m_seeking;
</del><ins>+ return m_seeking && !m_seekCompleted;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaSourceAVFObjC::setRateDouble(double rate)
</span><span class="cx"> {
</span><span class="cx"> m_rate = rate;
</span><del>- if (m_playing)
</del><ins>+ if (shouldBePlaying())
</ins><span class="cx"> [m_synchronizer setRate:m_rate];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -610,6 +617,11 @@
</span><span class="cx"> m_sampleBufferDisplayLayer = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaPlayerPrivateMediaSourceAVFObjC::shouldBePlaying() const
+{
+ return m_playing && !seeking() && m_readyState >= MediaPlayer::HaveFutureData;
+}
+
</ins><span class="cx"> void MediaPlayerPrivateMediaSourceAVFObjC::durationChanged()
</span><span class="cx"> {
</span><span class="cx"> m_player->durationChanged();
</span><span class="lines">@@ -663,6 +675,17 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_readyState = readyState;
</span><ins>+
+ if (!m_seekCompleted && m_readyState >= MediaPlayer::HaveCurrentData) {
+ m_seekCompleted = true;
+ m_player->timeChanged();
+ }
+
+ if (shouldBePlaying())
+ [m_synchronizer setRate:m_rate];
+ else
+ [m_synchronizer setRate:0];
+
</ins><span class="cx"> m_player->readyStateChanged();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>