Changeset 95799 in webkit

Timestamp:

Sep 23, 2011 7:03:46 AM (13 years ago)

Author:

yael.aharon@nokia.com

Message:

[Qt][Gtk] Wrong state when pausing a video in the "playing" event handler
​https://bugs.webkit.org/show_bug.cgi?id=68589

Reviewed by Philippe Normand.

Source/WebCore:

Test: media/video-playing-and-pause.html

As suggested by Alexis Menard on IRC, query gstreamer's state instead of using a cached value
in MediaPlayerGstreamerPrivate::paused().

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::paused):

LayoutTests:

• media/video-playing-and-pause.html: Added.
• media/video-paint-test.js:
• platform/qt/media/video-playing-and-pause-expected.txt: Added.
• platform/qt/media/video-playing-and-pause-expected.png: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-paint-test.js (modified) (1 diff)
• LayoutTests/media/video-playing-and-pause.html (added)
• LayoutTests/platform/qt/media/video-playing-and-pause-expected.png (added)
• LayoutTests/platform/qt/media/video-playing-and-pause-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-23  Yael Aharon  <yael.aharon@nokia.com>
+
+        [Qt][Gtk] Wrong state when pausing a video in the "playing" event handler
+        https://bugs.webkit.org/show_bug.cgi?id=68589
+
+        Reviewed by Philippe Normand.
+
+        * media/video-playing-and-pause.html: Added.
+        * media/video-paint-test.js:
+        * platform/qt/media/video-playing-and-pause-expected.txt: Added.
+        * platform/qt/media/video-playing-and-pause-expected.png: Added.
+
 2011-09-23  Marcus Bulach  <bulach@chromium.org>
 

trunk/LayoutTests/media/video-paint-test.js

@@ -28 +28 @@
     } , 8000);
 }
+
+function initAndPause()
+{
+    var totalCount = document.getElementsByTagName('video').length;
+    var count = totalCount;
+    document.addEventListener("canplaythrough", function () {
+        if (!--count) {
+            var video = document.getElementsByTagName('video')[0];
+            video.play();
+            video.addEventListener("playing", function() {
+                video.pause();
+                video.addEventListener("pause", function() {
+                    if (window.layoutTestController)
+                        layoutTestController.notifyDone();
+                });
+            });
+        }
+    }, true);
+}
+

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-23  Yael Aharon  <yael.aharon@nokia.com>
+
+        [Qt][Gtk] Wrong state when pausing a video in the "playing" event handler
+        https://bugs.webkit.org/show_bug.cgi?id=68589
+
+        Reviewed by Philippe Normand.
+
+        Test: media/video-playing-and-pause.html
+
+        As suggested by Alexis Menard on IRC, query gstreamer's state instead of using a cached value
+        in MediaPlayerGstreamerPrivate::paused(). 
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::paused):
+
 2011-09-15  Pavel Podivilov  <podivilov@chromium.org>
 

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

@@ -456 +456 @@
 bool MediaPlayerPrivateGStreamer::paused() const
 {
-    return m_paused;
+    GstState state;
+    gst_element_get_state(m_playBin, &state, 0, 0);
+    return state == GST_STATE_PAUSED;
 }