Attachment 346375 Details for Bug 188194 – Patch

[patch] Patch

bug-188194-20180802124025.patch (text/plain), 5.98 KB, created by Charlie Turner on 2018-08-02 04:40:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Turner

Created: 2018-08-02 04:40:26 PDT

Size: 5.98 KB

patch

obsolete

>Subversion Revision: 234497
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 52ea76b9821a6a21f8aa9e8a945bf0634e1f7613..06a2b235ed9782d26f498b2ee99213e28abf68c2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+2018-07-31  Charlie Turner  <cturner@igalia.com>
>+
>+        [GStreamer] Dynamically adjust blocksize
>+        https://bugs.webkit.org/show_bug.cgi?id=188194
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update the blocksize depending on how much is obtained from a read
>+        of the input stream. This avoids doing too many reads in small
>+        chunks when larger amounts of data are available and also prevents
>+        using a very large memory area to read a small chunk of data.
>+
>+        Adapted from https://bugzilla.gnome.org/show_bug.cgi?id=767833
>+
>+        No tests new tests since no change in functionality.
>+
>+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
>+        (webkit_web_src_init):
>+        (CachedResourceStreamingClient::checkUpdateBlocksize):
>+        (CachedResourceStreamingClient::dataReceived):
>+
> 2018-08-02  Charlie Turner  <cturner@igalia.com>
> 
>         [GStreamer] Stop pushing buffers when seeking status changes
>diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
>index d20ae555bdefba702275b300cefc0595843505ea..4f1a02fd2eb3a6d2004d4a8bf55068038f89f013 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
>@@ -43,6 +43,8 @@ public:
>     CachedResourceStreamingClient(WebKitWebSrc*, ResourceRequest&&);
>     virtual ~CachedResourceStreamingClient();
> private:
>+    void checkUpdateBlocksize(uint64_t bytesRead);
>+
>     // PlatformMediaResourceClient virtual methods.
>     void responseReceived(PlatformMediaResource&, const ResourceResponse&) override;
>     void dataReceived(PlatformMediaResource&, const char*, int) override;
>@@ -50,6 +52,15 @@ private:
>     void loadFailed(PlatformMediaResource&, const ResourceError&) override;
>     void loadFinished(PlatformMediaResource&) override;
> 
>+    static constexpr int s_growBlocksizeLimit { 1 };
>+    static constexpr int s_growBlocksizeCount { 1 };
>+    static constexpr int s_growBlocksizeFactor { 2 };
>+    static constexpr float s_reduceBlocksizeLimit { 0.20 };
>+    static constexpr int s_reduceBlocksizeCount { 2 };
>+    static constexpr float s_reduceBlocksizeFactor { 0.5 };
>+    int m_reduceBlocksizeCount { 0 };
>+    int m_increaseBlocksizeCount { 0 };
>+
>     GRefPtr<GstElement> m_src;
>     ResourceRequest m_request;
> };
>@@ -89,6 +100,8 @@ struct _WebKitWebSrcPrivate {
> 
>     guint64 requestedOffset;
> 
>+    uint64_t minimumBlocksize;
>+
>     RefPtr<MainThreadNotifier<MainThreadSourceNotification>> notifier;
>     GRefPtr<GstBuffer> buffer;
> };
>@@ -248,6 +261,8 @@ static void webkit_web_src_init(WebKitWebSrc* src)
>     gst_base_src_set_automatic_eos(GST_BASE_SRC(priv->appsrc), FALSE);
> 
>     gst_app_src_set_caps(priv->appsrc, nullptr);
>+
>+    priv->minimumBlocksize = gst_base_src_get_blocksize(GST_BASE_SRC_CAST(priv->appsrc));
> }
> 
> static void webKitWebSrcDispose(GObject* object)
>@@ -736,6 +751,41 @@ CachedResourceStreamingClient::CachedResourceStreamingClient(WebKitWebSrc* src,
> 
> CachedResourceStreamingClient::~CachedResourceStreamingClient() = default;
> 
>+void CachedResourceStreamingClient::checkUpdateBlocksize(uint64_t bytesRead)
>+{
>+    WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
>+    WebKitWebSrcPrivate* priv = src->priv;
>+
>+    uint64_t blocksize = gst_base_src_get_blocksize(GST_BASE_SRC_CAST(priv->appsrc));
>+    GST_LOG_OBJECT(src, "Checking to update blocksize. Read:%" PRIu64 " blocksize:%" PRIu64, bytesRead, blocksize);
>+
>+    if (bytesRead >= blocksize * s_growBlocksizeLimit) {
>+        m_reduceBlocksizeCount = 0;
>+        m_increaseBlocksizeCount++;
>+
>+        if (m_increaseBlocksizeCount >= s_growBlocksizeCount) {
>+            blocksize *= s_growBlocksizeFactor;
>+            GST_DEBUG_OBJECT(src, "Increased blocksize to %" PRIu64, blocksize);
>+            gst_base_src_set_blocksize(GST_BASE_SRC_CAST(priv->appsrc), blocksize);
>+            m_increaseBlocksizeCount = 0;
>+        }
>+    } else if (bytesRead < blocksize * s_reduceBlocksizeLimit) {
>+        m_reduceBlocksizeCount++;
>+        m_increaseBlocksizeCount = 0;
>+
>+        if (m_reduceBlocksizeCount >= s_reduceBlocksizeCount) {
>+            blocksize *= s_reduceBlocksizeFactor;
>+            blocksize = std::max(blocksize, priv->minimumBlocksize);
>+            GST_DEBUG_OBJECT(src, "Decreased blocksize to %" PRIu64, blocksize);
>+            gst_base_src_set_blocksize(GST_BASE_SRC_CAST(priv->appsrc), blocksize);
>+            m_reduceBlocksizeCount = 0;
>+        }
>+    } else {
>+        m_reduceBlocksizeCount = 0;
>+        m_increaseBlocksizeCount = 0;
>+    }
>+}
>+
> void CachedResourceStreamingClient::responseReceived(PlatformMediaResource&, const ResourceResponse& response)
> {
>     WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
>@@ -882,6 +932,8 @@ void CachedResourceStreamingClient::dataReceived(PlatformMediaResource&, const c
>     else
>         gst_buffer_set_size(priv->buffer.get(), static_cast<gssize>(length));
> 
>+    checkUpdateBlocksize(length);
>+
>     uint64_t startingOffset = priv->offset;
> 
>     if (priv->requestedOffset == priv->offset)
>@@ -898,7 +950,6 @@ void CachedResourceStreamingClient::dataReceived(PlatformMediaResource&, const c
>     // to push buffers that are too large, otherwise incorrect buffering messages can be sent from the
>     // pipeline.
>     uint64_t bufferSize = static_cast<uint64_t>(length);
>-    // FIXME: Implement adaptive block resizing
>     uint64_t blockSize = static_cast<uint64_t>(gst_base_src_get_blocksize(GST_BASE_SRC_CAST(priv->appsrc)));
>     GST_LOG_OBJECT(src, "Splitting the received buffer into %" PRIu64 " blocks", bufferSize / blockSize);
>     for (uint64_t currentOffset = 0; currentOffset < bufferSize; currentOffset += blockSize) {

Actions: View | Formatted Diff | Diff

Attachments on bug 188194: 346165 | 346374 | 346375