<!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>[161984] 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/161984">161984</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-14 10:59:07 -0800 (Tue, 14 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GStreamer] Playback rate is not set when pipeline is not ready.
https://bugs.webkit.org/show_bug.cgi?id=126692
Patch by Piotr Grad <p.grad@samsung.com> on 2014-01-14
Reviewed by Philippe Normand.
No new tests. Covered by existing tests.
Added new method updatePlaybackRate which is called when playback rate change is possible.
Added m_lastPlaybackRate in order to retrieve last correct playback rate and notify upper
layers about that setting playback rate failed.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
(WebCore::MediaPlayerPrivateGStreamer::updatePlaybackRate):
(WebCore::MediaPlayerPrivateGStreamer::setRate):
(WebCore::MediaPlayerPrivateGStreamer::updateStates):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161983 => 161984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-14 18:42:20 UTC (rev 161983)
+++ trunk/Source/WebCore/ChangeLog 2014-01-14 18:59:07 UTC (rev 161984)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-01-14 Piotr Grad <p.grad@samsung.com>
+
+ [GStreamer] Playback rate is not set when pipeline is not ready.
+ https://bugs.webkit.org/show_bug.cgi?id=126692
+
+ Reviewed by Philippe Normand.
+
+ No new tests. Covered by existing tests.
+
+ Added new method updatePlaybackRate which is called when playback rate change is possible.
+ Added m_lastPlaybackRate in order to retrieve last correct playback rate and notify upper
+ layers about that setting playback rate failed.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
+ (WebCore::MediaPlayerPrivateGStreamer::updatePlaybackRate):
+ (WebCore::MediaPlayerPrivateGStreamer::setRate):
+ (WebCore::MediaPlayerPrivateGStreamer::updateStates):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
</ins><span class="cx"> 2014-01-14 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r161978.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (161983 => 161984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-01-14 18:42:20 UTC (rev 161983)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-01-14 18:59:07 UTC (rev 161984)
</span><span class="lines">@@ -250,6 +250,7 @@
</span><span class="cx"> , m_timeOfOverlappingSeek(-1)
</span><span class="cx"> , m_buffering(false)
</span><span class="cx"> , m_playbackRate(1)
</span><ins>+ , m_lastPlaybackRate(1)
</ins><span class="cx"> , m_errorOccured(false)
</span><span class="cx"> , m_mediaDuration(0)
</span><span class="cx"> , m_downloadFinished(false)
</span><span class="lines">@@ -632,6 +633,38 @@
</span><span class="cx"> GST_SEEK_TYPE_SET, startTime, GST_SEEK_TYPE_SET, endTime);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateGStreamer::updatePlaybackRate()
+{
+ if (!m_changingRate)
+ return;
+
+ float currentPosition = static_cast<float>(playbackPosition() * GST_SECOND);
+ bool mute = false;
+
+ INFO_MEDIA_MESSAGE("Set Rate to %f", m_playbackRate);
+
+ if (m_playbackRate > 0) {
+ // Mute the sound if the playback rate is too extreme and
+ // audio pitch is not adjusted.
+ mute = (!m_preservesPitch && (m_playbackRate < 0.8 || m_playbackRate > 2));
+ } else {
+ if (currentPosition == 0.0f)
+ currentPosition = -1.0f;
+ mute = true;
+ }
+
+ INFO_MEDIA_MESSAGE("Need to mute audio?: %d", (int) mute);
+ if (doSeek(currentPosition, m_playbackRate, static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH))) {
+ g_object_set(m_playBin.get(), "mute", mute, NULL);
+ m_lastPlaybackRate = m_playbackRate;
+ } else {
+ m_playbackRate = m_lastPlaybackRate;
+ ERROR_MEDIA_MESSAGE("Set rate to %f failed", m_playbackRate);
+ }
+ m_changingRate = false;
+ m_player->rateChanged();
+}
+
</ins><span class="cx"> bool MediaPlayerPrivateGStreamer::paused() const
</span><span class="cx"> {
</span><span class="cx"> if (m_isEndReached) {
</span><span class="lines">@@ -830,48 +863,38 @@
</span><span class="cx"> void MediaPlayerPrivateGStreamer::setRate(float rate)
</span><span class="cx"> {
</span><span class="cx"> // Avoid useless playback rate update.
</span><del>- if (m_playbackRate == rate)
</del><ins>+ if (m_playbackRate == rate) {
+ // and make sure that upper layers were notified if rate was set
+
+ if (!m_changingRate && m_player->rate() != m_playbackRate)
+ m_player->rateChanged();
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ if (isLiveStream()) {
+ // notify upper layers that we cannot handle passed rate.
+ m_changingRate = false;
+ m_player->rateChanged();
+ return;
+ }
+
</ins><span class="cx"> GstState state;
</span><span class="cx"> GstState pending;
</span><span class="cx">
</span><ins>+ m_playbackRate = rate;
+ m_changingRate = true;
+
</ins><span class="cx"> gst_element_get_state(m_playBin.get(), &state, &pending, 0);
</span><span class="cx"> if ((state != GST_STATE_PLAYING && state != GST_STATE_PAUSED)
</span><span class="cx"> || (pending == GST_STATE_PAUSED))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (isLiveStream())
- return;
-
- m_playbackRate = rate;
- m_changingRate = true;
-
</del><span class="cx"> if (!rate) {
</span><span class="cx"> changePipelineState(GST_STATE_PAUSED);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- float currentPosition = static_cast<float>(playbackPosition() * GST_SECOND);
- bool mute = false;
-
- INFO_MEDIA_MESSAGE("Set Rate to %f", rate);
- if (rate > 0) {
- // Mute the sound if the playback rate is too extreme and
- // audio pitch is not adjusted.
- mute = (!m_preservesPitch && (rate < 0.8 || rate > 2));
- } else {
- if (currentPosition == 0.0f)
- currentPosition = -1.0f;
- mute = true;
- }
-
- INFO_MEDIA_MESSAGE("Need to mute audio?: %d", (int) mute);
-
- if (!doSeek(currentPosition, rate, static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH)))
- ERROR_MEDIA_MESSAGE("Set rate to %f failed", rate);
- else
- g_object_set(m_playBin.get(), "mute", mute, NULL);
</del><ins>+ updatePlaybackRate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::setPreservesPitch(bool preservesPitch)
</span><span class="lines">@@ -1394,11 +1417,6 @@
</span><span class="cx"> } else
</span><span class="cx"> m_paused = true;
</span><span class="cx">
</span><del>- if (m_changingRate) {
- m_player->rateChanged();
- m_changingRate = false;
- }
-
</del><span class="cx"> if (m_requestedState == GST_STATE_PAUSED && state == GST_STATE_PAUSED) {
</span><span class="cx"> shouldUpdatePlaybackState = true;
</span><span class="cx"> LOG_MEDIA_MESSAGE("Requested state change to %s was completed", gst_element_state_get_name(state));
</span><span class="lines">@@ -1453,12 +1471,15 @@
</span><span class="cx"> m_player->readyStateChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_seekIsPending && getStateResult == GST_STATE_CHANGE_SUCCESS && (state == GST_STATE_PAUSED || state == GST_STATE_PLAYING)) {
- LOG_MEDIA_MESSAGE("[Seek] committing pending seek to %f", m_seekTime);
- m_seekIsPending = false;
- m_seeking = doSeek(toGstClockTime(m_seekTime), m_player->rate(), static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE));
- if (!m_seeking)
- LOG_MEDIA_MESSAGE("[Seek] seeking to %f failed", m_seekTime);
</del><ins>+ if (getStateResult == GST_STATE_CHANGE_SUCCESS && state >= GST_STATE_PAUSED) {
+ updatePlaybackRate();
+ if (m_seekIsPending) {
+ LOG_MEDIA_MESSAGE("[Seek] committing pending seek to %f", m_seekTime);
+ m_seekIsPending = false;
+ m_seeking = doSeek(toGstClockTime(m_seekTime), m_player->rate(), static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE));
+ if (!m_seeking)
+ LOG_MEDIA_MESSAGE("[Seek] seeking to %f failed", m_seekTime);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (161983 => 161984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-01-14 18:42:20 UTC (rev 161983)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-01-14 18:59:07 UTC (rev 161984)
</span><span class="lines">@@ -147,6 +147,7 @@
</span><span class="cx"> void processTableOfContentsEntry(GstTocEntry*, GstTocEntry* parent);
</span><span class="cx"> #endif
</span><span class="cx"> bool doSeek(gint64 position, float rate, GstSeekFlags seekType);
</span><ins>+ void updatePlaybackRate();
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> virtual String engineDescription() const { return "GStreamer"; }
</span><span class="lines">@@ -174,6 +175,7 @@
</span><span class="cx"> bool m_canFallBackToLastFinishedSeekPositon;
</span><span class="cx"> bool m_buffering;
</span><span class="cx"> float m_playbackRate;
</span><ins>+ float m_lastPlaybackRate;
</ins><span class="cx"> bool m_errorOccured;
</span><span class="cx"> mutable gfloat m_mediaDuration;
</span><span class="cx"> bool m_downloadFinished;
</span></span></pre>
</div>
</div>
</body>
</html>