Changeset 149735 in webkit

Timestamp:

May 8, 2013 6:41:13 AM (11 years ago)

Author:

kov@webkit.org

Message:

[GStreamer] Does memory buffering even with preload set to none
​https://bugs.webkit.org/show_bug.cgi?id=115754

Patch by Gustavo Noronha Silva <​gustavo.noronha@collabora.com> on 2013-05-08
Reviewed by Philippe Normand.

Covered by existing tests.

Revision 148840 fixed on-disk buffering being done when preload is set to none,
but memory buffering is still being done. That is because setting the state to
paused causes GStreamer to start loading the media, to gather information. Only
doing that when committing the load avoids that while maintaining the tested
behaviour unchanged.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::load): move setting pause state to commitLoad.
(WebCore::MediaPlayerPrivateGStreamer::commitLoad): see above.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-08  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
+
+        [GStreamer] Does memory buffering even with preload set to none
+        https://bugs.webkit.org/show_bug.cgi?id=115754
+
+        Reviewed by Philippe Normand.
+
+        Covered by existing tests.
+
+        Revision 148840 fixed on-disk buffering being done when preload is set to none,
+        but memory buffering is still being done. That is because setting the state to
+        paused causes GStreamer to start loading the media, to gather information. Only
+        doing that when committing the load avoids that while maintaining the tested
+        behaviour unchanged.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::load): move setting pause state to commitLoad.
+        (WebCore::MediaPlayerPrivateGStreamer::commitLoad): see above.
+
 2013-05-08  Andreas Kling  <akling@apple.com>
 

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

@@ -300 +300 @@
     m_volumeAndMuteInitialized = false;
 
+    if (!m_delayingLoad)
+        commitLoad();
+}
+
+#if ENABLE(MEDIA_SOURCE)
+void MediaPlayerPrivateGStreamer::load(const String& url, PassRefPtr<MediaSource>)
+{
+    notImplemented();
+}
+#endif
+
+void MediaPlayerPrivateGStreamer::commitLoad()
+{
+    ASSERT(!m_delayingLoad);
+    LOG_MEDIA_MESSAGE("Committing load.");
+
     // GStreamer needs to have the pipeline set to a paused state to
     // start providing anything useful.
     gst_element_set_state(m_playBin.get(), GST_STATE_PAUSED);
 
-    if (!m_delayingLoad)
-        commitLoad();
-}
-
-#if ENABLE(MEDIA_SOURCE)
-void MediaPlayerPrivateGStreamer::load(const String& url, PassRefPtr<MediaSource>)
-{
-    notImplemented();
-}
-#endif
-
-void MediaPlayerPrivateGStreamer::commitLoad()
-{
-    ASSERT(!m_delayingLoad);
-    LOG_MEDIA_MESSAGE("Committing load.");
     updateStates();
 }