<!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>[50726] trunk/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/50726">50726</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2009-11-10 01:45:52 -0800 (Tue, 10 Nov 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-11-10  Philippe Normand  &lt;pnormand@igalia.com&gt;

        Reviewed by Jan Alonzo.

        https://bugs.webkit.org/show_bug.cgi?id=31047
        [GTK] Failing test media/video-played-ranges-1.html

        Fix playback rate setter by remembering the rate was changed. Also
        correctly handle reverse playback by doing a seek from end to
        beginning of the media.

        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
        (WebCore::MediaPlayerPrivate::currentTime):
        (WebCore::MediaPlayerPrivate::seek):
        (WebCore::MediaPlayerPrivate::hasAudio):
        (WebCore::MediaPlayerPrivate::setVolume):
        (WebCore::MediaPlayerPrivate::setRate):
        (WebCore::MediaPlayerPrivate::updateStates):
        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicsgtkMediaPlayerPrivateGStreamercpp">trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkWebCoreplatformgraphicsgtkMediaPlayerPrivateGStreamerh">trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (50725 => 50726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-11-10 09:19:19 UTC (rev 50725)
+++ trunk/WebCore/ChangeLog        2009-11-10 09:45:52 UTC (rev 50726)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2009-11-10  Philippe Normand  &lt;pnormand@igalia.com&gt;
+
+        Reviewed by Jan Alonzo.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31047
+        [GTK] Failing test media/video-played-ranges-1.html
+
+        Fix playback rate setter by remembering the rate was changed. Also
+        correctly handle reverse playback by doing a seek from end to
+        beginning of the media.
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+        (WebCore::MediaPlayerPrivate::currentTime):
+        (WebCore::MediaPlayerPrivate::seek):
+        (WebCore::MediaPlayerPrivate::hasAudio):
+        (WebCore::MediaPlayerPrivate::setVolume):
+        (WebCore::MediaPlayerPrivate::setRate):
+        (WebCore::MediaPlayerPrivate::updateStates):
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.h:
+
</ins><span class="cx"> 2009-11-10  Oliver Hunt  &lt;oliver@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Maciej Stachowiak.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsgtkMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp (50725 => 50726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp        2009-11-10 09:19:19 UTC (rev 50725)
+++ trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp        2009-11-10 09:45:52 UTC (rev 50726)
</span><span class="lines">@@ -99,6 +99,33 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static float playbackPosition(GstElement* playbin)
+{
+
+    float ret = 0.0;
+
+    GstQuery* query = gst_query_new_position(GST_FORMAT_TIME);
+    if (!gst_element_query(playbin, query)) {
+        LOG_VERBOSE(Media, &quot;Position query failed...&quot;);
+        gst_query_unref(query);
+        return ret;
+    }
+
+    gint64 position;
+    gst_query_parse_position(query, 0, &amp;position);
+
+    // Position is available only if the pipeline is not in NULL or
+    // READY state.
+    if (position != GST_CLOCK_TIME_NONE)
+        ret = (float) (position / 1000000000.0);
+
+    LOG_VERBOSE(Media, &quot;Position %&quot; GST_TIME_FORMAT, GST_TIME_ARGS(position));
+
+    gst_query_unref(query);
+
+    return ret;
+}
+
</ins><span class="cx"> void mediaPlayerPrivateRepaintCallback(WebKitVideoSink*, GstBuffer *buffer, MediaPlayerPrivate* playerPrivate)
</span><span class="cx"> {
</span><span class="cx">     g_return_if_fail(GST_IS_BUFFER(buffer));
</span><span class="lines">@@ -137,6 +164,7 @@
</span><span class="cx">     , m_videoSink(0)
</span><span class="cx">     , m_source(0)
</span><span class="cx">     , m_seekTime(0)
</span><ins>+    , m_changingRate(false)
</ins><span class="cx">     , m_endTime(numeric_limits&lt;float&gt;::infinity())
</span><span class="cx">     , m_networkState(MediaPlayer::Empty)
</span><span class="cx">     , m_readyState(MediaPlayer::HaveNothing)
</span><span class="lines">@@ -229,23 +257,8 @@
</span><span class="cx">     if (m_seeking)
</span><span class="cx">         return m_seekTime;
</span><span class="cx"> 
</span><del>-    float ret = 0.0;
</del><ins>+    return playbackPosition(m_playBin);
</ins><span class="cx"> 
</span><del>-    GstQuery* query = gst_query_new_position(GST_FORMAT_TIME);
-    if (!gst_element_query(m_playBin, query)) {
-        LOG_VERBOSE(Media, &quot;Position query failed...&quot;);
-        gst_query_unref(query);
-        return ret;
-    }
-
-    gint64 position;
-    gst_query_parse_position(query, 0, &amp;position);
-    ret = (float) (position / 1000000000.0);
-    LOG_VERBOSE(Media, &quot;Position %&quot; GST_TIME_FORMAT, GST_TIME_ARGS(position));
-
-    gst_query_unref(query);
-
-    return ret;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivate::seek(float time)
</span><span class="lines">@@ -271,6 +284,8 @@
</span><span class="cx">     else {
</span><span class="cx">         m_seeking = true;
</span><span class="cx">         m_seekTime = sec;
</span><ins>+        // Wait some time for the seek to complete.
+        gst_element_get_state(m_playBin, 0, 0, 40 * GST_MSECOND);
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -363,16 +378,53 @@
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivate::setRate(float rate)
</span><span class="cx"> {
</span><del>-    if (rate == 0.0) {
-        gst_element_set_state(m_playBin, GST_STATE_PAUSED);
</del><ins>+    GstState state;
+    GstState pending;
+
+    gst_element_get_state(m_playBin,
+        &amp;state, &amp;pending, 250 * GST_NSECOND);
+    if (state != GST_STATE_PLAYING &amp;&amp; state != GST_STATE_PAUSED)
</ins><span class="cx">         return;
</span><del>-    }
</del><span class="cx"> 
</span><span class="cx">     if (m_isStreaming)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    m_changingRate = true;
+    float currentPosition = playbackPosition(m_playBin) * GST_SECOND;
+    GstSeekFlags flags = (GstSeekFlags)(GST_SEEK_FLAG_FLUSH);
+    gint64 start, end;
+    bool mute = false;
+
</ins><span class="cx">     LOG_VERBOSE(Media, &quot;Set Rate to %f&quot;, rate);
</span><del>-    seek(currentTime());
</del><ins>+    if (rate &gt;= 0) {
+        // Mute the sound if the playback rate is too extreme.
+        // TODO: in other cases we should perform pitch adjustments.
+        mute = (bool) (rate &lt; 0.8 || rate &gt; 2);
+        start = currentPosition;
+        end = GST_CLOCK_TIME_NONE;
+    } else {
+        start = 0;
+        mute = true;
+
+        // If we are at beginning of media, start from the end to
+        // avoid immediate EOS.
+        if (currentPosition == 0 || currentPosition == -1)
+            end = duration() * GST_SECOND;
+        else
+            end = currentPosition;
+    }
+
+    LOG_VERBOSE(Media, &quot;Need to mute audio: %d&quot;, (int) mute);
+
+    if (!gst_element_seek(m_playBin, rate, GST_FORMAT_TIME, flags,
+                          GST_SEEK_TYPE_SET, start,
+                          GST_SEEK_TYPE_SET, end))
+        LOG_VERBOSE(Media, &quot;Set rate to %f failed&quot;, rate);
+    else {
+        g_object_set(m_playBin, &quot;mute&quot;, mute, NULL);
+        // Wait some time for the seek to complete.
+        gst_element_get_state(m_playBin, 0, 0, 40 * GST_MSECOND);
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int MediaPlayerPrivate::dataRate() const
</span><span class="lines">@@ -507,6 +559,11 @@
</span><span class="cx">         } else
</span><span class="cx">             m_paused = true;
</span><span class="cx"> 
</span><ins>+        if (m_changingRate) {
+            m_player-&gt;rateChanged();
+            m_changingRate = false;
+        }
+
</ins><span class="cx">         if (m_seeking) {
</span><span class="cx">             shouldUpdateAfterSeek = true;
</span><span class="cx">             m_seeking = false;
</span><span class="lines">@@ -570,11 +627,6 @@
</span><span class="cx">     updateStates();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivate::rateChanged()
-{
-    updateStates();
-}
-
</del><span class="cx"> void MediaPlayerPrivate::sizeChanged()
</span><span class="cx"> {
</span><span class="cx">     notImplemented();
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsgtkMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h (50725 => 50726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h        2009-11-10 09:19:19 UTC (rev 50725)
+++ trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h        2009-11-10 09:45:52 UTC (rev 50726)
</span><span class="lines">@@ -90,7 +90,6 @@
</span><span class="cx">             void setSize(const IntSize&amp;);
</span><span class="cx"> 
</span><span class="cx">             void loadStateChanged();
</span><del>-            void rateChanged();
</del><span class="cx">             void sizeChanged();
</span><span class="cx">             void timeChanged();
</span><span class="cx">             void volumeChanged();
</span><span class="lines">@@ -126,6 +125,7 @@
</span><span class="cx">             GstElement* m_videoSink;
</span><span class="cx">             GstElement* m_source;
</span><span class="cx">             GstClockTime m_seekTime;
</span><ins>+            bool m_changingRate;
</ins><span class="cx">             float m_endTime;
</span><span class="cx">             bool m_isEndReached;
</span><span class="cx">             MediaPlayer::NetworkState m_networkState;
</span></span></pre>
</div>
</div>

</body>
</html>