Changeset 273513 in webkit

Timestamp:

Feb 25, 2021, 2:14:59 PM (6 years ago)

Author:

jer.noble@apple.com

Message:

[Cocoa] Appending a partial segment of a WebM audio file results in no additional samples
​https://bugs.webkit.org/show_bug.cgi?id=222407
<rdar://74610383>

Reviewed by Eric Carlson.

Source/WebCore:

Test: media/media-source/media-source-webm-vorbis-partial.html

When appending a partial WebM segment, it can occur that the parser is mid-way through
parsing a Block or SimpleBlock, and is waiting for enough data to be appended to construct a
full sample. However, previous appends are not accounted for when calculated the amount of
data to be requested from the reader, which both results in too much data read and a
miscalculation of the bytesRemaining out-param. This causes all subsequent appends to
generate no samples, leading to an apparent stall in playback.

Add a new ivar to track the number of partial bytes read, and use that value to calculate
the number of bytes yet to be parsed.

• platform/graphics/cocoa/SourceBufferParserWebM.cpp:

(WebCore::SourceBufferParserWebM::VideoTrackData::createSampleBuffer):

• platform/graphics/cocoa/SourceBufferParserWebM.h:

LayoutTests:

• platform/mac-bigsur/media/media-source/content/test-48kHz-vorbis-manifest.json: Added.
• platform/mac-bigsur/media/media-source/content/test-48kHz-vorbis.webm: Added.
• platform/mac-bigsur/media/media-source/media-source-webm-vorbis-partial-expected.txt: Added.
• platform/mac-bigsur/media/media-source/media-source-webm-vorbis-partial.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-bigsur/media/media-source/content/test-48kHz-vorbis-manifest.json (added)
• LayoutTests/platform/mac-bigsur/media/media-source/content/test-48kHz-vorbis.webm (added)
• LayoutTests/platform/mac-bigsur/media/media-source/media-source-webm-vorbis-partial-expected.txt (added)
• LayoutTests/platform/mac-bigsur/media/media-source/media-source-webm-vorbis-partial.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-02-25  Jer Noble  <jer.noble@apple.com>
+
+        [Cocoa] Appending a partial segment of a WebM audio file results in no additional samples
+        https://bugs.webkit.org/show_bug.cgi?id=222407
+        <rdar://74610383>
+
+        Reviewed by Eric Carlson.
+
+        * platform/mac-bigsur/media/media-source/content/test-48kHz-vorbis-manifest.json: Added.
+        * platform/mac-bigsur/media/media-source/content/test-48kHz-vorbis.webm: Added.
+        * platform/mac-bigsur/media/media-source/media-source-webm-vorbis-partial-expected.txt: Added.
+        * platform/mac-bigsur/media/media-source/media-source-webm-vorbis-partial.html: Added.
+
 2021-02-25  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-25  Jer Noble  <jer.noble@apple.com>
+
+        [Cocoa] Appending a partial segment of a WebM audio file results in no additional samples
+        https://bugs.webkit.org/show_bug.cgi?id=222407
+        <rdar://74610383>
+
+        Reviewed by Eric Carlson.
+
+        Test: media/media-source/media-source-webm-vorbis-partial.html
+
+        When appending a partial WebM segment, it can occur that the parser is mid-way through
+        parsing a Block or SimpleBlock, and is waiting for enough data to be appended to construct a
+        full sample. However, previous appends are not accounted for when calculated the amount of
+        data to be requested from the reader, which both results in too much data read and a
+        miscalculation of the `bytesRemaining` out-param. This causes all subsequent appends to
+        generate no samples, leading to an apparent stall in playback.
+
+        Add a new ivar to track the number of partial bytes read, and use that value to calculate
+        the number of bytes yet to be parsed.
+
+        * platform/graphics/cocoa/SourceBufferParserWebM.cpp:
+        (WebCore::SourceBufferParserWebM::VideoTrackData::createSampleBuffer):
+        * platform/graphics/cocoa/SourceBufferParserWebM.h:
+
 2021-02-25  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp

@@ -1227 +1227 @@
     m_packetData.resize(m_packetBytesRead + metadata.size);
     size_t packetDataOffset = m_packetBytesRead;
+
+    ASSERT(m_partialBytesRead < metadata.size);
     size_t bytesToRead = metadata.size;
+    if (m_partialBytesRead && m_partialBytesRead < bytesToRead)
+        bytesToRead -= m_partialBytesRead;
     while (bytesToRead) {
         uint64_t bytesRead;
@@ -1236 +1240 @@
 
         // FIXME: We can't yet handle parsing a Frame that doesn't have all its memory available.
-        if (status.code == webm::Status::kOkPartial || status.code == webm::Status::kWouldBlock)
+        if (status.code == webm::Status::kOkPartial || status.code == webm::Status::kWouldBlock) {
+            m_partialBytesRead += bytesRead;
             return status;
+        }
+
+        m_partialBytesRead = 0;
     }
 

trunk/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.h

@@ -216 +216 @@
         size_t m_packetBytesRead { 0 };
         size_t m_byteOffset { 0 };
+        size_t m_partialBytesRead { 0 };
         Vector<AudioStreamPacketDescription> m_packetDescriptions;