Changeset 169200 in webkit

Timestamp:

May 22, 2014 7:57:59 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-paused-0-rate-expected.txt (added)
• LayoutTests/media/video-paused-0-rate.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (10 diffs)
• Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
 2014-05-22  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2014-05-22  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -190 +190 @@
     , m_resetPipeline(false)
     , m_paused(true)
+    , m_playbackRatePause(false)
     , m_seeking(false)
     , m_seekIsPending(false)
@@ -407 +408 @@
 void MediaPlayerPrivateGStreamer::play()
 {
+    if (!m_playbackRate) {
+        m_playbackRatePause = true;
+        return;
+    }
+
     if (changePipelineState(GST_STATE_PLAYING)) {
         m_isEndReached = false;
@@ -420 +426 @@
 void MediaPlayerPrivateGStreamer::pause()
 {
+    m_playbackRatePause = false;
     GstState currentState, pendingState;
     gst_element_get_state(m_playBin.get(), &currentState, &pendingState, 0);
@@ -556 +563 @@
     }
 
+    if (!rate)
+        rate = 1.0;
+
     return gst_element_seek(m_playBin.get(), rate, GST_FORMAT_TIME, seekType,
         GST_SEEK_TYPE_SET, startTime, GST_SEEK_TYPE_SET, endTime);
@@ -588 +598 @@
         ERROR_MEDIA_MESSAGE("Set rate to %f failed", m_playbackRate);
     }
+
+    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;
+    }
+
     m_changingRate = false;
     m_player->rateChanged();
@@ -598 +619 @@
         return true;
     }
+
+    if (m_playbackRatePause)
+        return false;
 
     GstState state;
@@ -800 +824 @@
 
     gst_element_get_state(m_playBin.get(), &state, &pending, 0);
+
+    if (!rate) {
+        m_changingRate = false;
+        m_playbackRatePause = true;
+        if (state != GST_STATE_PAUSED && pending != GST_STATE_PAUSED)
+            changePipelineState(GST_STATE_PAUSED);
+        return;
+    }
+
     if ((state != GST_STATE_PLAYING && state != GST_STATE_PAUSED)
         || (pending == GST_STATE_PAUSED))
         return;
-
-    if (!rate) {
-        changePipelineState(GST_STATE_PAUSED);
-        return;
-    }
 
     updatePlaybackRate();
@@ -1380 +1408 @@
             }
 
-            if (didBuffering && !m_buffering && !m_paused) {
+            if (didBuffering && !m_buffering && !m_paused && m_playbackRate) {
                 LOG_MEDIA_MESSAGE("[Buffering] Restarting playback.");
                 changePipelineState(GST_STATE_PLAYING);
@@ -1387 +1415 @@
             m_paused = false;
 
-            if (m_buffering && !isLiveStream()) {
+            if ((m_buffering && !isLiveStream()) || !m_playbackRate) {
                 LOG_MEDIA_MESSAGE("[Buffering] Pausing stream for buffering.");
                 changePipelineState(GST_STATE_PAUSED);
@@ -1424 +1452 @@
             m_paused = false;
 
-        if (!m_paused)
+        if (!m_paused && m_playbackRate)
             changePipelineState(GST_STATE_PLAYING);
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h

@@ -178 +178 @@
     bool m_resetPipeline;
     bool m_paused;
+    bool m_playbackRatePause;
     bool m_seeking;
     bool m_seekIsPending;