Title: [152893] trunk
Revision
152893
Author
[email protected]
Date
2013-07-19 03:31:27 -0700 (Fri, 19 Jul 2013)

Log Message

[GTK] media/video-seek-multiple.html is failing
https://bugs.webkit.org/show_bug.cgi?id=117580

Patch by Miguel Gomez <[email protected]> on 2013-07-19
Reviewed by Philippe Normand.

Source/WebCore:

When receiving several seek calls in a row, ensure that the final position
is the one requested in the last call received.

Already covered in test media/video-seek-multiple.html

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::seek):

LayoutTests:

Change expectation for media/video-seek-multiple.html test

* platform/gtk/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (152892 => 152893)


--- trunk/LayoutTests/ChangeLog	2013-07-19 10:26:11 UTC (rev 152892)
+++ trunk/LayoutTests/ChangeLog	2013-07-19 10:31:27 UTC (rev 152893)
@@ -1,3 +1,14 @@
+2013-07-19  Miguel Gomez  <[email protected]>
+
+        [GTK] media/video-seek-multiple.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=117580
+
+        Reviewed by Philippe Normand.
+
+        Change expectation for media/video-seek-multiple.html test
+
+        * platform/gtk/TestExpectations:
+
 2013-07-19  Gabor Abraham  <[email protected]>
 
         [Qt] Unreviewed gardening. Rebase failing tests.

Modified: trunk/LayoutTests/platform/gtk/TestExpectations (152892 => 152893)


--- trunk/LayoutTests/platform/gtk/TestExpectations	2013-07-19 10:26:11 UTC (rev 152892)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2013-07-19 10:31:27 UTC (rev 152893)
@@ -1397,8 +1397,6 @@
 
 webkit.org/b/116806 fast/css/text-overflow-ellipsis-behind-floats.html [ ImageOnlyFailure ]
 
-webkit.org/b/117580 media/video-seek-multiple.html [ Failure ]
-
 webkit.org/b/117581 accessibility/text-role-with-aria-hidden-inside.html [ Failure ]
 
 webkit.org/b/117582 fast/flexbox/clear-overflow-before-scroll-update.html [ Failure ]

Modified: trunk/Source/WebCore/ChangeLog (152892 => 152893)


--- trunk/Source/WebCore/ChangeLog	2013-07-19 10:26:11 UTC (rev 152892)
+++ trunk/Source/WebCore/ChangeLog	2013-07-19 10:31:27 UTC (rev 152893)
@@ -1,3 +1,18 @@
+2013-07-19  Miguel Gomez  <[email protected]>
+
+        [GTK] media/video-seek-multiple.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=117580
+
+        Reviewed by Philippe Normand.
+
+        When receiving several seek calls in a row, ensure that the final position
+        is the one requested in the last call received.
+
+        Already covered in test media/video-seek-multiple.html
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::seek):
+
 2013-07-19  Kangil Han  <[email protected]>
 
         Use explicit HTMLFrameElementBase cast and introduce toHTMLFrameElementBase

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (152892 => 152893)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2013-07-19 10:26:11 UTC (rev 152892)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2013-07-19 10:31:27 UTC (rev 152893)
@@ -503,11 +503,11 @@
     INFO_MEDIA_MESSAGE("[Seek] seeking to %" GST_TIME_FORMAT " (%f)", GST_TIME_ARGS(clockTime), time);
 
     if (m_seeking) {
+        m_timeOfOverlappingSeek = time;
         if (m_seekIsPending) {
             m_seekTime = time;
             return;
         }
-        m_timeOfOverlappingSeek = time;
     }
 
     GstState state;
@@ -1045,11 +1045,12 @@
         else {
             LOG_MEDIA_MESSAGE("[Seek] seeked to %f", m_seekTime);
             m_seeking = false;
-            if (m_timeOfOverlappingSeek != -1) {
+            if (m_timeOfOverlappingSeek != m_seekTime && m_timeOfOverlappingSeek != -1) {
                 seek(m_timeOfOverlappingSeek);
                 m_timeOfOverlappingSeek = -1;
                 return;
             }
+            m_timeOfOverlappingSeek = -1;
 
             // The pipeline can still have a pending state. In this case a position query will fail.
             // Right now we can use m_seekTime as a fallback.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to