Changeset 277345 in webkit

Timestamp:

May 11, 2021, 5:46:17 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[MSE] QuotaExceededError Exception not thrown even if the sum of totalTrackBufferSize and appendBuffer size exceeds maximumBufferSize.
​https://bugs.webkit.org/show_bug.cgi?id=225630

Patch by Toshio Ogasawara <​toshio.ogasawara@access-company.com> on 2021-05-11
Reviewed by Eric Carlson.

Source/WebCore:

Test: media/media-source/media-source-append-buffer-full-quota-exceeded-error.html

• Modules/mediasource/SourceBuffer.cpp:

(WebCore::SourceBuffer::appendBufferInternal):

• platform/graphics/SourceBufferPrivate.cpp:

(WebCore::SourceBufferPrivate::evictCodedFrames):

• platform/graphics/SourceBufferPrivate.h:

LayoutTests:

• media/media-source/media-source-append-buffer-full-quota-exceeded-error-expected.txt: Added.
• media/media-source/media-source-append-buffer-full-quota-exceeded-error.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-source/media-source-append-buffer-full-quota-exceeded-error-expected.txt (added)
• LayoutTests/media/media-source/media-source-append-buffer-full-quota-exceeded-error.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediasource/SourceBuffer.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/SourceBufferPrivate.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/SourceBufferPrivate.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-05-11  Toshio Ogasawara  <toshio.ogasawara@access-company.com>
+
+        [MSE] QuotaExceededError Exception not thrown even if the sum of totalTrackBufferSize and appendBuffer size exceeds maximumBufferSize.
+        https://bugs.webkit.org/show_bug.cgi?id=225630
+
+        Reviewed by Eric Carlson.
+
+        * media/media-source/media-source-append-buffer-full-quota-exceeded-error-expected.txt: Added.
+        * media/media-source/media-source-append-buffer-full-quota-exceeded-error.html: Added.
+
 2021-05-11  Robert Jenner  <jenner@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-11  Toshio Ogasawara  <toshio.ogasawara@access-company.com>
+
+        [MSE] QuotaExceededError Exception not thrown even if the sum of totalTrackBufferSize and appendBuffer size exceeds maximumBufferSize.
+        https://bugs.webkit.org/show_bug.cgi?id=225630
+
+        Reviewed by Eric Carlson.
+
+        Test: media/media-source/media-source-append-buffer-full-quota-exceeded-error.html
+
+        * Modules/mediasource/SourceBuffer.cpp:
+        (WebCore::SourceBuffer::appendBufferInternal):
+        * platform/graphics/SourceBufferPrivate.cpp:
+        (WebCore::SourceBufferPrivate::evictCodedFrames):
+        * platform/graphics/SourceBufferPrivate.h:
+
 2021-05-11  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp

@@ -492 +492 @@
 
     // 5. If the buffer full flag equals true, then throw a QuotaExceededError exception and abort these step.
-    if (m_private->bufferFull()) {
+    if (m_private->bufferFull() || m_private->totalTrackBufferSizeInBytes() + m_pendingAppendData.capacity() + size >= maximumBufferSize()) {
         ERROR_LOG(LOGIDENTIFIER, "buffer full, failing with QuotaExceededError error");
         return Exception { QuotaExceededError };

trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.cpp

@@ -640 +640 @@
     // 1. Let new data equal the data that is about to be appended to this SourceBuffer.
     // 2. If the buffer full flag equals false, then abort these steps.
-    if (!m_bufferFull)
+    if (!m_bufferFull && totalTrackBufferSizeInBytes() + pendingAppendDataCapacity + newDataSize < maximumBufferSize)
         return;
 

trunk/Source/WebCore/platform/graphics/SourceBufferPrivate.h

@@ -109 +109 @@
 
     MediaTime timestampOffset() const { return m_timestampOffset; }
+    uint64_t totalTrackBufferSizeInBytes() const;
 
     struct TrackBuffer {
@@ -169 +170 @@
     void setBufferFull(bool bufferFull) { m_bufferFull = bufferFull; }
     void provideMediaData(const AtomString& trackID);
-    uint64_t totalTrackBufferSizeInBytes() const;
 
     SourceBufferPrivateClient* m_client { nullptr };