Changeset 96311 in webkit

Timestamp:

Sep 29, 2011 1:07:19 AM (13 years ago)

Author:

Philippe Normand

Message:

[GStreamer] 2 flaky media tests
​https://bugs.webkit.org/show_bug.cgi?id=67407

Reviewed by Martin Robinson.

Workaround for GStreamer bug#639941. In GStreamer
0.10.35 basesink reports wrong duration in case of EOS and
negative playback rate. This workaround fixes two media tests,
media/video-timeupdate-reverse-play.html and
media/video-reverse-play-duration.html.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::prepareToPlay):
(WebCore::MediaPlayerPrivateGStreamer::currentTime):
(WebCore::MediaPlayerPrivateGStreamer::didEnd):

Location:

trunk

Files:

• LayoutTests/platform/gtk/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (3 diffs)

trunk/LayoutTests/platform/gtk/test_expectations.txt

@@ -12 +12 @@
 BUGWK68536 : media/media-blocked-by-beforeload.html = PASS TEXT
 BUGWK68878 : media/video-playing-and-pause.html = PASS TEXT
-BUGWK67407 : media/video-timeupdate-reverse-play.html = PASS TEXT
 
 BUGWK68523 : svg/zoom/page/zoom-svg-through-object-with-auto-size.html = PASS TEXT

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-29  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] 2 flaky media tests
+        https://bugs.webkit.org/show_bug.cgi?id=67407
+
+        Reviewed by Martin Robinson.
+
+        Workaround for GStreamer bug#639941. In GStreamer
+        0.10.35 basesink reports wrong duration in case of EOS and
+        negative playback rate. This workaround fixes two media tests,
+        media/video-timeupdate-reverse-play.html and
+        media/video-reverse-play-duration.html.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::prepareToPlay):
+        (WebCore::MediaPlayerPrivateGStreamer::currentTime):
+        (WebCore::MediaPlayerPrivateGStreamer::didEnd):
+
 2011-09-29  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -355 +355 @@
 void MediaPlayerPrivateGStreamer::prepareToPlay()
 {
+    m_isEndReached = false;
+
     if (m_delayingLoad) {
         m_delayingLoad = false;
@@ -412 +414 @@
     if (m_seeking)
         return m_seekTime;
+
+    // Workaround for
+    // https://bugzilla.gnome.org/show_bug.cgi?id=639941 In GStreamer
+    // 0.10.35 basesink reports wrong duration in case of EOS and
+    // negative playback rate. There's no upstream accepted patch for
+    // this bug yet, hence this temporary workaround.
+    if (m_isEndReached && m_playbackRate < 0)
+        return 0.0f;
 
     return playbackPosition();
@@ -1326 +1336 @@
     }
 
+    m_isEndReached = true;
+
     gst_element_set_state(m_playBin, GST_STATE_PAUSED);