Changeset 65494 in webkit

Timestamp:

Aug 17, 2010 5:15:04 AM (14 years ago)

Author:

vestbo@webkit.org

Message:

[Qt] Pre-roll media when loading media elements

Reviewed by Antonio Gomes.

This ensures we get correct size-hints from QtMultimedia, as well as
the media states Buffering and Buffered instead of Loading and Loaded,
which we use to transition into MediaPlayer::HaveEnoughData.

• platform/graphics/qt/MediaPlayerPrivateQt.cpp:
• platform/graphics/qt/MediaPlayerPrivateQt.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/MediaPlayerPrivateQt.cpp (modified) (5 diffs)
• platform/graphics/qt/MediaPlayerPrivateQt.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-17  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Pre-roll media when loading media elements
+
+        This ensures we get correct size-hints from QtMultimedia, as well as
+        the media states Buffering and Buffered instead of Loading and Loaded,
+        which we use to transition into MediaPlayer::HaveEnoughData.
+
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        * platform/graphics/qt/MediaPlayerPrivateQt.h:
+
 2010-08-16  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp

@@ -26 +26 @@
 #include "HTMLMediaElement.h"
 #include "HTMLVideoElement.h"
+#include "NotImplemented.h"
 #include "TimeRanges.h"
 #include "Widget.h"
@@ -107 +108 @@
     connect(m_mediaPlayer, SIGNAL(error(QMediaPlayer::Error)),
             this, SLOT(handleError(QMediaPlayer::Error)));
+    connect(m_mediaPlayer, SIGNAL(bufferStatusChanged(int)),
+            this, SLOT(bufferStatusChanged(int)));
     connect(m_mediaPlayer, SIGNAL(durationChanged(qint64)),
             this, SLOT(durationChanged(qint64)));
@@ -209 +212 @@
     m_mediaPlayer->setMuted(element->muted());
     m_mediaPlayer->setVolume(static_cast<int>(element->volume() * 100.0));
+
+    // Setting a media source will start loading the media, but we need
+    // to pre-roll as well to get video size-hints and buffer-status
+    if (element->paused())
+        m_mediaPlayer->pause();
+    else
+        m_mediaPlayer->play();
 }
 
@@ -323 +333 @@
 unsigned MediaPlayerPrivate::bytesLoaded() const
 {
-    unsigned percentage = m_mediaPlayer->bufferStatus();
-
-    if (percentage == 100) {
-        if (m_networkState != MediaPlayer::Idle) {
-            m_networkState = MediaPlayer::Idle;
-            m_player->networkStateChanged();
-        }
-        if (m_readyState != MediaPlayer::HaveEnoughData) {
-            m_readyState = MediaPlayer::HaveEnoughData;
-            m_player->readyStateChanged();
-        }
-    }
-
     QLatin1String bytesLoadedKey("bytes-loaded");
     if (m_mediaPlayer->availableExtendedMetaData().contains(bytesLoadedKey))
         return m_mediaPlayer->extendedMetaData(bytesLoadedKey).toInt();
 
-    return percentage;
+    return m_mediaPlayer->bufferStatus();
 }
 
@@ -438 +435 @@
         m_isSeeking = false;
     }
+}
+
+void MediaPlayerPrivate::bufferStatusChanged(int)
+{
+    notImplemented();
 }
 

trunk/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h

@@ -104 +104 @@
     void positionChanged(qint64);
     void durationChanged(qint64);
+    void bufferStatusChanged(int);
     void volumeChanged(int);
     void mutedChanged(bool);