Changeset 56010 in webkit

Timestamp:

Mar 15, 2010 1:18:47 PM (14 years ago)

Author:

Philippe Normand

Message:

2010-03-15 Philippe Normand <​pnormand@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GStreamer] duration query optimizations
​https://bugs.webkit.org/show_bug.cgi?id=36116

Don't reattempt duration queries that previously failed and cache
media duration only if it's known.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: (WebCore::MediaPlayerPrivate::MediaPlayerPrivate): (WebCore::MediaPlayerPrivate::duration): (WebCore::MediaPlayerPrivate::updateStates): (WebCore::MediaPlayerPrivate::durationChanged):
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-15  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GStreamer] duration query optimizations
+        https://bugs.webkit.org/show_bug.cgi?id=36116
+
+        Don't reattempt duration queries that previously failed and cache
+        media duration only if it's known.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+        (WebCore::MediaPlayerPrivate::duration):
+        (WebCore::MediaPlayerPrivate::updateStates):
+        (WebCore::MediaPlayerPrivate::durationChanged):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
 2010-03-11  Peter Kasting  <pkasting@google.com>
 

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

@@ -299 +299 @@
     , m_preload(MediaPlayer::Auto)
     , m_delayingLoad(false)
+    , m_mediaDurationKnown(true)
 {
     if (doGstInit())
@@ -417 +418 @@
     if (m_errorOccured)
         return 0.0;
+
+    // Media duration query failed already, don't attempt new useless queries.
+    if (!m_mediaDurationKnown)
+        return numeric_limits<float>::infinity();
 
     if (m_mediaDuration)
@@ -876 +881 @@
             if (!m_mediaDuration) {
                 float newDuration = duration();
-                if (!isinf(newDuration))
+                m_mediaDurationKnown = !isinf(newDuration);
+                if (m_mediaDurationKnown)
                     m_mediaDuration = newDuration;
             }
@@ -1114 +1120 @@
 
     // And re-cache it if possible.
+    GstState state;
+    gst_element_get_state(m_playBin, &state, 0, 0);
     float newDuration = duration();
+
+    if (state <= GST_STATE_READY) {
+        // Don't set m_mediaDurationKnown yet if the pipeline is not
+        // paused. This allows duration() query to fail at least once
+        // before playback starts and duration becomes known.
+        if (!isinf(newDuration))
+            m_mediaDuration = newDuration;
+    } else {
+        m_mediaDurationKnown = !isinf(newDuration);
+        if (m_mediaDurationKnown)
+            m_mediaDuration = newDuration;
+    }
+
     if (!isinf(newDuration))
         m_mediaDuration = newDuration;

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

@@ -171 +171 @@
             MediaPlayer::Preload m_preload;
             bool m_delayingLoad;
+            bool m_mediaDurationKnown;
     };
 }