<!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>[160992] 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/160992">160992</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-23 05:15:07 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GStreamer] video/audio seeking is not unified.
https://bugs.webkit.org/show_bug.cgi?id=125852
Patch by Piotr Grad <p.grad@samsung.com> on 2013-12-23
Reviewed by Philippe Normand.
This bug is fixing regression with seeking audio/video elements and unifies seeking
in MediaPlayerPrivateGStreamer.
Test: media/video-seek-with-negative-playback.html
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::seek):
(WebCore::MediaPlayerPrivateGStreamer::seekIncludingRate):
(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 (160991 => 160992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-23 10:18:51 UTC (rev 160991)
+++ trunk/Source/WebCore/ChangeLog 2013-12-23 13:15:07 UTC (rev 160992)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-12-23 Piotr Grad <p.grad@samsung.com>
+
+ [GStreamer] video/audio seeking is not unified.
+ https://bugs.webkit.org/show_bug.cgi?id=125852
+
+ Reviewed by Philippe Normand.
+
+ This bug is fixing regression with seeking audio/video elements and unifies seeking
+ in MediaPlayerPrivateGStreamer.
+
+ Test: media/video-seek-with-negative-playback.html
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::seek):
+ (WebCore::MediaPlayerPrivateGStreamer::seekIncludingRate):
+ (WebCore::MediaPlayerPrivateGStreamer::setRate):
+ (WebCore::MediaPlayerPrivateGStreamer::updateStates):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
</ins><span class="cx"> 2013-12-23 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> [GTK][WK2] WebGL is not working with GLES
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (160991 => 160992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2013-12-23 10:18:51 UTC (rev 160991)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2013-12-23 13:15:07 UTC (rev 160992)
</span><span class="lines">@@ -599,18 +599,8 @@
</span><span class="cx"> loadingFailed(MediaPlayer::Empty);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- gint64 startTime, endTime;
- if (m_player->rate() > 0) {
- startTime = clockTime;
- endTime = GST_CLOCK_TIME_NONE;
- } else {
- startTime = 0;
- endTime = clockTime;
- }
-
</del><span class="cx"> // We can seek now.
</span><del>- if (!gst_element_seek(m_playBin.get(), m_player->rate(), GST_FORMAT_TIME, static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE),
- GST_SEEK_TYPE_SET, startTime, GST_SEEK_TYPE_SET, endTime)) {
</del><ins>+ if (!doSeek(clockTime, m_player->rate(), static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE))) {
</ins><span class="cx"> LOG_MEDIA_MESSAGE("[Seek] seeking to %f failed", time);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -621,6 +611,27 @@
</span><span class="cx"> m_isEndReached = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaPlayerPrivateGStreamer::doSeek(gint64 position, float rate, GstSeekFlags seekType)
+{
+ gint64 startTime, endTime;
+
+ if (rate > 0) {
+ startTime = position;
+ endTime = GST_CLOCK_TIME_NONE;
+ } else {
+ startTime = 0;
+ // If we are at beginning of media, start from the end to
+ // avoid immediate EOS.
+ if (position < 0)
+ endTime = static_cast<gint64>(duration() * GST_SECOND);
+ else
+ endTime = position;
+ }
+
+ return gst_element_seek(m_playBin.get(), rate, GST_FORMAT_TIME, seekType,
+ GST_SEEK_TYPE_SET, startTime, GST_SEEK_TYPE_SET, endTime);
+}
+
</ins><span class="cx"> bool MediaPlayerPrivateGStreamer::paused() const
</span><span class="cx"> {
</span><span class="cx"> if (m_isEndReached) {
</span><span class="lines">@@ -842,8 +853,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float currentPosition = static_cast<float>(playbackPosition() * GST_SECOND);
</span><del>- GstSeekFlags flags = (GstSeekFlags)(GST_SEEK_FLAG_FLUSH);
- gint64 start, end;
</del><span class="cx"> bool mute = false;
</span><span class="cx">
</span><span class="cx"> INFO_MEDIA_MESSAGE("Set Rate to %f", rate);
</span><span class="lines">@@ -851,25 +860,15 @@
</span><span class="cx"> // Mute the sound if the playback rate is too extreme and
</span><span class="cx"> // audio pitch is not adjusted.
</span><span class="cx"> mute = (!m_preservesPitch && (rate < 0.8 || rate > 2));
</span><del>- start = currentPosition;
- end = GST_CLOCK_TIME_NONE;
</del><span class="cx"> } else {
</span><del>- start = 0;
</del><ins>+ if (currentPosition == 0.0f)
+ currentPosition = -1.0f;
</ins><span class="cx"> mute = true;
</span><del>-
- // If we are at beginning of media, start from the end to
- // avoid immediate EOS.
- if (currentPosition <= 0)
- end = static_cast<gint64>(duration() * GST_SECOND);
- else
- end = currentPosition;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> INFO_MEDIA_MESSAGE("Need to mute audio?: %d", (int) mute);
</span><span class="cx">
</span><del>- if (!gst_element_seek(m_playBin.get(), rate, GST_FORMAT_TIME, flags,
- GST_SEEK_TYPE_SET, start,
- GST_SEEK_TYPE_SET, end))
</del><ins>+ if (!doSeek(currentPosition, rate, static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH)))
</ins><span class="cx"> ERROR_MEDIA_MESSAGE("Set rate to %f failed", rate);
</span><span class="cx"> else
</span><span class="cx"> g_object_set(m_playBin.get(), "mute", mute, NULL);
</span><span class="lines">@@ -1457,8 +1456,7 @@
</span><span class="cx"> if (m_seekIsPending && getStateResult == GST_STATE_CHANGE_SUCCESS && (state == GST_STATE_PAUSED || state == GST_STATE_PLAYING)) {
</span><span class="cx"> LOG_MEDIA_MESSAGE("[Seek] committing pending seek to %f", m_seekTime);
</span><span class="cx"> m_seekIsPending = false;
</span><del>- m_seeking = gst_element_seek(m_playBin.get(), m_player->rate(), GST_FORMAT_TIME, static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE),
- GST_SEEK_TYPE_SET, toGstClockTime(m_seekTime), GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
</del><ins>+ m_seeking = doSeek(toGstClockTime(m_seekTime), m_player->rate(), static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE));
</ins><span class="cx"> if (!m_seeking)
</span><span class="cx"> LOG_MEDIA_MESSAGE("[Seek] seeking to %f failed", m_seekTime);
</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 (160991 => 160992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2013-12-23 10:18:51 UTC (rev 160991)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2013-12-23 13:15:07 UTC (rev 160992)
</span><span class="lines">@@ -146,7 +146,9 @@
</span><span class="cx"> void processTableOfContents(GstMessage*);
</span><span class="cx"> void processTableOfContentsEntry(GstTocEntry*, GstTocEntry* parent);
</span><span class="cx"> #endif
</span><ins>+ bool doSeek(gint64 position, float rate, GstSeekFlags seekType);
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> virtual String engineDescription() const { return "GStreamer"; }
</span><span class="cx"> virtual bool isLiveStream() const { return m_isStreaming; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>