Title: [149996] releases/WebKitGTK/webkit-2.0/Source/WebCore
- Revision
- 149996
- Author
- [email protected]
- Date
- 2013-05-13 00:43:02 -0700 (Mon, 13 May 2013)
Log Message
Merge r149735 - [GStreamer] Does memory buffering even with preload set to none
https://bugs.webkit.org/show_bug.cgi?id=115754
Patch by Gustavo Noronha Silva <[email protected]> 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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog (149995 => 149996)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-05-13 07:33:50 UTC (rev 149995)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-05-13 07:43:02 UTC (rev 149996)
@@ -1,3 +1,22 @@
+2013-05-08 Gustavo Noronha Silva <[email protected]>
+
+ [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-04-12 Balazs Kelemen <[email protected]>
[GStreamer] Media attribute preload="none" is not honored
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (149995 => 149996)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2013-05-13 07:33:50 UTC (rev 149995)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2013-05-13 07:43:02 UTC (rev 149996)
@@ -288,10 +288,6 @@
m_player->readyStateChanged();
m_volumeAndMuteInitialized = false;
- // 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();
}
@@ -300,6 +296,11 @@
{
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);
+
updateStates();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
