<!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>[169330] releases/WebKitGTK/webkit-2.4</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/169330">169330</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-26 00:30:55 -0700 (Mon, 26 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/169200">r169200</a> - Video is resumed with old playback rate.
https://bugs.webkit.org/show_bug.cgi?id=132905
Patch by Piotr Grad <p.grad@samsung.com> on 2014-05-22
Reviewed by Philippe Normand.
Source/WebCore:
Setting '0' playback rate is causing pipeline to pause.
GStreamer player impl. exposed this information to upper layers but it should not.
Solution is to hidden such situation behind m_playbackRatePause flag.
Test: media/video-paused-0-rate.html
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
(WebCore::MediaPlayerPrivateGStreamer::play):
(WebCore::MediaPlayerPrivateGStreamer::pause):
(WebCore::MediaPlayerPrivateGStreamer::doSeek):
(WebCore::MediaPlayerPrivateGStreamer::updatePlaybackRate):
(WebCore::MediaPlayerPrivateGStreamer::paused):
(WebCore::MediaPlayerPrivateGStreamer::setRate):
(WebCore::MediaPlayerPrivateGStreamer::updateStates):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
LayoutTests:
* media/video-paused-0-rate-expected.txt: Added.
* media/video-paused-0-rate.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsmediavideopaused0rateexpectedtxt">releases/WebKitGTK/webkit-2.4/LayoutTests/media/video-paused-0-rate-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsmediavideopaused0ratehtml">releases/WebKitGTK/webkit-2.4/LayoutTests/media/video-paused-0-rate.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog (169329 => 169330)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-05-26 07:15:08 UTC (rev 169329)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-05-26 07:30:55 UTC (rev 169330)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-22 Piotr Grad <p.grad@samsung.com>
+
+ Video is resumed with old playback rate.
+ https://bugs.webkit.org/show_bug.cgi?id=132905
+
+ Reviewed by Philippe Normand.
+
+ * media/video-paused-0-rate-expected.txt: Added.
+ * media/video-paused-0-rate.html: Added.
+
</ins><span class="cx"> 2014-05-06 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Dragging text from one paragraph to another does not render as expected
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsmediavideopaused0rateexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/media/video-paused-0-rate-expected.txt (0 => 169330)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/media/video-paused-0-rate-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/media/video-paused-0-rate-expected.txt 2014-05-26 07:30:55 UTC (rev 169330)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+
+Test that setting '0' playbackRate works correctly.
+
+EVENT(canplaythrough)
+EXPECTED (video.currentTime == '0') OK
+EXPECTED (video.paused == 'false') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsmediavideopaused0ratehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/media/video-paused-0-rate.html (0 => 169330)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/media/video-paused-0-rate.html (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/media/video-paused-0-rate.html 2014-05-26 07:30:55 UTC (rev 169330)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
+ <script>
+ var timeUpdateWasCalled = false;
+ function start()
+ {
+ findMediaElement();
+ video.src = findMediaFile("video", "content/test");
+ waitForEventAndFail('ended');
+ video.addEventListener('timeupdate', timeupdate);
+ waitForEventOnce('canplaythrough', canPlayThrough);
+ }
+
+ function canPlayThrough()
+ {
+ video.playbackRate = 0;
+ video.play();
+ }
+
+ function timeupdate()
+ {
+ testExpected('video.currentTime', 0);
+ testExpected('video.paused', false);
+ if(timeUpdateWasCalled)
+ failTest("Time was updated, but should not change.");
+ timeUpdateWasCalled = true;
+ setTimeout("endTest()", 150);
+ }
+ </script>
+ </head>
+ <body onload="start()">
+ <video></video>
+ <p>Test that setting '0' playbackRate works correctly.</p>
+ </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (169329 => 169330)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-05-26 07:15:08 UTC (rev 169329)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-05-26 07:30:55 UTC (rev 169330)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-05-22 Piotr Grad <p.grad@samsung.com>
+
+ Video is resumed with old playback rate.
+ https://bugs.webkit.org/show_bug.cgi?id=132905
+
+ Reviewed by Philippe Normand.
+
+ Setting '0' playback rate is causing pipeline to pause.
+ GStreamer player impl. exposed this information to upper layers but it should not.
+ Solution is to hidden such situation behind m_playbackRatePause flag.
+
+ Test: media/video-paused-0-rate.html
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
+ (WebCore::MediaPlayerPrivateGStreamer::play):
+ (WebCore::MediaPlayerPrivateGStreamer::pause):
+ (WebCore::MediaPlayerPrivateGStreamer::doSeek):
+ (WebCore::MediaPlayerPrivateGStreamer::updatePlaybackRate):
+ (WebCore::MediaPlayerPrivateGStreamer::paused):
+ (WebCore::MediaPlayerPrivateGStreamer::setRate):
+ (WebCore::MediaPlayerPrivateGStreamer::updateStates):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
</ins><span class="cx"> 2014-04-30 Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Use GstMetaVideo
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (169329 => 169330)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-05-26 07:15:08 UTC (rev 169329)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-05-26 07:30:55 UTC (rev 169330)
</span><span class="lines">@@ -245,6 +245,7 @@
</span><span class="cx"> , m_mediaLocationCurrentIndex(0)
</span><span class="cx"> , m_resetPipeline(false)
</span><span class="cx"> , m_paused(true)
</span><ins>+ , m_playbackRatePause(false)
</ins><span class="cx"> , m_seeking(false)
</span><span class="cx"> , m_seekIsPending(false)
</span><span class="cx"> , m_timeOfOverlappingSeek(-1)
</span><span class="lines">@@ -480,6 +481,11 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::play()
</span><span class="cx"> {
</span><ins>+ if (!m_playbackRate) {
+ m_playbackRatePause = true;
+ return;
+ }
+
</ins><span class="cx"> if (changePipelineState(GST_STATE_PLAYING)) {
</span><span class="cx"> m_isEndReached = false;
</span><span class="cx"> m_delayingLoad = false;
</span><span class="lines">@@ -493,6 +499,7 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::pause()
</span><span class="cx"> {
</span><ins>+ m_playbackRatePause = false;
</ins><span class="cx"> GstState currentState, pendingState;
</span><span class="cx"> gst_element_get_state(m_playBin.get(), &currentState, &pendingState, 0);
</span><span class="cx"> if (currentState < GST_STATE_PAUSED && pendingState <= GST_STATE_PAUSED)
</span><span class="lines">@@ -629,6 +636,9 @@
</span><span class="cx"> endTime = position;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!rate)
+ rate = 1.0;
+
</ins><span class="cx"> return gst_element_seek(m_playBin.get(), rate, GST_FORMAT_TIME, seekType,
</span><span class="cx"> GST_SEEK_TYPE_SET, startTime, GST_SEEK_TYPE_SET, endTime);
</span><span class="cx"> }
</span><span class="lines">@@ -661,6 +671,17 @@
</span><span class="cx"> m_playbackRate = m_lastPlaybackRate;
</span><span class="cx"> ERROR_MEDIA_MESSAGE("Set rate to %f failed", m_playbackRate);
</span><span class="cx"> }
</span><ins>+
+ if (m_playbackRatePause) {
+ GstState state;
+ GstState pending;
+
+ gst_element_get_state(m_playBin.get(), &state, &pending, 0);
+ if (state != GST_STATE_PLAYING && pending != GST_STATE_PLAYING)
+ changePipelineState(GST_STATE_PLAYING);
+ m_playbackRatePause = false;
+ }
+
</ins><span class="cx"> m_changingRate = false;
</span><span class="cx"> m_player->rateChanged();
</span><span class="cx"> }
</span><span class="lines">@@ -672,6 +693,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_playbackRatePause)
+ return false;
+
</ins><span class="cx"> GstState state;
</span><span class="cx"> gst_element_get_state(m_playBin.get(), &state, 0, 0);
</span><span class="cx"> return state == GST_STATE_PAUSED;
</span><span class="lines">@@ -888,15 +912,19 @@
</span><span class="cx"> m_changingRate = true;
</span><span class="cx">
</span><span class="cx"> gst_element_get_state(m_playBin.get(), &state, &pending, 0);
</span><del>- if ((state != GST_STATE_PLAYING && state != GST_STATE_PAUSED)
- || (pending == GST_STATE_PAUSED))
- return;
</del><span class="cx">
</span><span class="cx"> if (!rate) {
</span><del>- changePipelineState(GST_STATE_PAUSED);
</del><ins>+ m_changingRate = false;
+ m_playbackRatePause = true;
+ if (state != GST_STATE_PAUSED && pending != GST_STATE_PAUSED)
+ changePipelineState(GST_STATE_PAUSED);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ((state != GST_STATE_PLAYING && state != GST_STATE_PAUSED)
+ || (pending == GST_STATE_PAUSED))
+ return;
+
</ins><span class="cx"> updatePlaybackRate();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1406,14 +1434,14 @@
</span><span class="cx"> m_volumeAndMuteInitialized = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (didBuffering && !m_buffering && !m_paused) {
</del><ins>+ if (didBuffering && !m_buffering && !m_paused && m_playbackRate) {
</ins><span class="cx"> LOG_MEDIA_MESSAGE("[Buffering] Restarting playback.");
</span><span class="cx"> changePipelineState(GST_STATE_PLAYING);
</span><span class="cx"> }
</span><span class="cx"> } else if (state == GST_STATE_PLAYING) {
</span><span class="cx"> m_paused = false;
</span><span class="cx">
</span><del>- if (m_buffering && !isLiveStream()) {
</del><ins>+ if ((m_buffering && !isLiveStream()) || !m_playbackRate) {
</ins><span class="cx"> LOG_MEDIA_MESSAGE("[Buffering] Pausing stream for buffering.");
</span><span class="cx"> changePipelineState(GST_STATE_PAUSED);
</span><span class="cx"> }
</span><span class="lines">@@ -1450,7 +1478,7 @@
</span><span class="cx"> } else if (state == GST_STATE_PLAYING)
</span><span class="cx"> m_paused = false;
</span><span class="cx">
</span><del>- if (!m_paused)
</del><ins>+ if (!m_paused && m_playbackRate)
</ins><span class="cx"> changePipelineState(GST_STATE_PLAYING);
</span><span class="cx">
</span><span class="cx"> m_networkState = MediaPlayer::Loading;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (169329 => 169330)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-05-26 07:15:08 UTC (rev 169329)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-05-26 07:30:55 UTC (rev 169330)
</span><span class="lines">@@ -170,6 +170,7 @@
</span><span class="cx"> int m_mediaLocationCurrentIndex;
</span><span class="cx"> bool m_resetPipeline;
</span><span class="cx"> bool m_paused;
</span><ins>+ bool m_playbackRatePause;
</ins><span class="cx"> bool m_seeking;
</span><span class="cx"> bool m_seekIsPending;
</span><span class="cx"> float m_timeOfOverlappingSeek;
</span></span></pre>
</div>
</div>
</body>
</html>