Changeset 50873 in webkit

Timestamp:

Nov 12, 2009 2:39:57 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-12 Philippe Normand <​pnormand@igalia.com>

Reviewed by Jan Alonzo.

​https://bugs.webkit.org/show_bug.cgi?id=31047
[GTK] Failing test media/video-played-ranges-1.html

Follow-up of r50726, don't block the UI thread when calling
gst_element_get_state(). Also fixed a compilation warning and some
static casts.

• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp: (WebCore::playbackPosition): (WebCore::MediaPlayerPrivate::seek): (WebCore::MediaPlayerPrivate::setRate):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-12  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Jan Alonzo.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31047
+        [GTK] Failing test media/video-played-ranges-1.html
+
+        Follow-up of r50726, don't block the UI thread when calling
+        gst_element_get_state(). Also fixed a compilation warning and some
+        static casts.
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::playbackPosition):
+        (WebCore::MediaPlayerPrivate::seek):
+        (WebCore::MediaPlayerPrivate::setRate):
+
 2009-11-12  Philippe Normand  <pnormand@igalia.com>
 

trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp

@@ -117 +117 @@
     // Position is available only if the pipeline is not in NULL or
     // READY state.
-    if (position != GST_CLOCK_TIME_NONE)
-        ret = (float) (position / 1000000000.0);
+    if (position !=  static_cast<gint64>(GST_CLOCK_TIME_NONE))
+        ret = static_cast<float>(position) / static_cast<float>(GST_SECOND);
 
     LOG_VERBOSE(Media, "Position %" GST_TIME_FORMAT, GST_TIME_ARGS(position));
@@ -392 +392 @@
     GstState pending;
 
-    gst_element_get_state(m_playBin,
-        &state, &pending, 250 * GST_NSECOND);
-    if (state != GST_STATE_PLAYING && state != GST_STATE_PAUSED)
+    gst_element_get_state(m_playBin, &state, &pending, 0);
+    if ((state != GST_STATE_PLAYING && state != GST_STATE_PAUSED)
+        || (pending == GST_STATE_PAUSED))
         return;
 
@@ -419 +419 @@
         // If we are at beginning of media, start from the end to
         // avoid immediate EOS.
-        if (currentPosition == 0 || currentPosition == -1)
+        if (currentPosition <= 0)
             end = duration() * GST_SECOND;
         else
@@ -431 +431 @@
                           GST_SEEK_TYPE_SET, end))
         LOG_VERBOSE(Media, "Set rate to %f failed", rate);
-    else {
+    else
         g_object_set(m_playBin, "mute", mute, NULL);
-        // Wait some time for the seek to complete.
-        gst_element_get_state(m_playBin, 0, 0, 40 * GST_MSECOND);
-    }
 }