Changeset 152391 in webkit

Timestamp:

Jul 4, 2013 12:44:16 AM (11 years ago)

Author:

kbalazs@webkit.org

Message:

[GStreamer] support preload="metadata"
​https://bugs.webkit.org/show_bug.cgi?id=116817

Reviewed by Eric Carlson.

Source/WebCore:

Add appropriate behavior for preload="metadata". Delay enabling download buffering
until playback is started in this case. This behavior fits with the standard quite
well and this is the most exact match we can get (at least without adding too much
extra complexity). What matters mostly is that we can avoid loading the media
before playback but we have the first frame and the metadata.

Test: media/video-load-preload-metadata.html

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::prepareToPlay): Set |m_preload| to |Auto|
so we will start download buffering if we did not start it yet.
(WebCore::MediaPlayerPrivateGStreamer::play): Ditto.
(MediaPlayerPrivateGStreamer::setDownloadBuffering): Only start download
buffering if |m_preload == Auto|. Also make sure we don't clear the download
flag once we started downloading because it would result in not well defined
behavior and it does not really makes sense.
(MediaPlayerPrivateGStreamer::setPreload): Set download buffering accordingly.

LayoutTests:

• media/video-load-preload-metadata.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-load-preload-metadata-expected.txt (added)
• LayoutTests/media/video-load-preload-metadata.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-07-04  Balazs Kelemen  <b.kelemen@samsung.com>
+
+        [GStreamer] support preload="metadata"
+        https://bugs.webkit.org/show_bug.cgi?id=116817
+
+        Reviewed by Eric Carlson.
+
+        * media/video-load-preload-metadata.html: Added.
+
 2013-07-03  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-04  Balazs Kelemen  <b.kelemen@samsung.com>
+
+        [GStreamer] support preload="metadata"
+        https://bugs.webkit.org/show_bug.cgi?id=116817
+
+        Reviewed by Eric Carlson.
+
+        Add appropriate behavior for preload="metadata". Delay enabling download buffering
+        until playback is started in this case. This behavior fits with the standard quite
+        well and this is the most exact match we can get (at least without adding too much
+        extra complexity). What matters mostly is that we can avoid loading the media
+        before playback but we have the first frame and the metadata.
+
+        Test: media/video-load-preload-metadata.html
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::prepareToPlay): Set |m_preload| to |Auto|
+        so we will start download buffering if we did not start it yet.
+        (WebCore::MediaPlayerPrivateGStreamer::play): Ditto.
+        (MediaPlayerPrivateGStreamer::setDownloadBuffering): Only start download
+        buffering if |m_preload == Auto|. Also make sure we don't clear the download
+        flag once we started downloading because it would result in not well defined
+        behavior and it does not really makes sense.
+        (MediaPlayerPrivateGStreamer::setPreload): Set download buffering accordingly.
+
 2013-07-03  Jae Hyun Park  <jae.park@company100.net>
 

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

@@ -397 +397 @@
 void MediaPlayerPrivateGStreamer::prepareToPlay()
 {
+    m_preload = MediaPlayer::Auto;
     if (m_delayingLoad) {
         m_delayingLoad = false;
@@ -408 +409 @@
         m_isEndReached = false;
         m_delayingLoad = false;
+        m_preload = MediaPlayer::Auto;
         setDownloadBuffering();
         LOG_MEDIA_MESSAGE("Play");
@@ -1082 +1084 @@
             m_resetPipeline = true;
             m_mediaDuration = 0;
-        } else
+        } else {
+            m_resetPipeline = false;
             cacheDuration();
+        }
 
         bool didBuffering = m_buffering;
@@ -1518 +1522 @@
     GstPlayFlags flags;
     g_object_get(m_playBin.get(), "flags", &flags, NULL);
-    bool shouldDownload = !isLiveStream();
+
+    // We don't want to stop downloading if we already started it.
+    if (flags & GST_PLAY_FLAG_DOWNLOAD && m_readyState > MediaPlayer::HaveNothing && !m_resetPipeline)
+        return;
+
+    bool shouldDownload = !isLiveStream() && m_preload == MediaPlayer::Auto;
     if (shouldDownload) {
         LOG_MEDIA_MESSAGE("Enabling on-disk buffering");
@@ -1536 +1545 @@
 
     m_preload = preload;
+    setDownloadBuffering();
 
     if (m_delayingLoad && m_preload != MediaPlayer::None) {