Changeset 280948 in webkit

Timestamp:

Aug 11, 2021 5:46:39 PM (11 months ago)

Author:

Jean-Yves Avenard

Message:

Audio buffer may contain more frames than decoded.
​https://bugs.webkit.org/show_bug.cgi?id=228732
rdar://problem/81447014

Reviewed by Eric Carlson.

Source/WebCore:

It is necessary to call repeatedly ExtAudioFileRead until it explicitly indicates that
it reached EOF.
Test: webaudio/decode-audio-data-wav.html.

• platform/audio/cocoa/AudioFileReaderCocoa.cpp:

(WebCore::AudioFileReader::createBus): Ensure that all frames have been decoded and
trim length to the actual number of frames returned.
This was already done for the webm case.

LayoutTests:

• platform/mac/TestExpectations:
• webaudio/decode-audio-data-wav-expected.txt: Added.
• webaudio/decode-audio-data-wav.html: Added.
• webaudio/pinknoise.wav: Added. Generated with command

sox -b 16 -r 44100 -n pinknoise.wav synth 4 pinknoise

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• LayoutTests/webaudio/decode-audio-data-wav-expected.txt (added)
• LayoutTests/webaudio/decode-audio-data-wav.html (added)
• LayoutTests/webaudio/pinknoise.wav (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/audio/cocoa/AudioFileReaderCocoa.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-08-11  Jean-Yves Avenard  <jya@apple.com>
+
+        Audio buffer may contain more frames than decoded.
+        https://bugs.webkit.org/show_bug.cgi?id=228732
+        rdar://problem/81447014
+
+        Reviewed by Eric Carlson.
+
+        * platform/mac/TestExpectations:
+        * webaudio/decode-audio-data-wav-expected.txt: Added.
+        * webaudio/decode-audio-data-wav.html: Added.
+        * webaudio/pinknoise.wav: Added. Generated with command
+        sox -b 16 -r 44100 -n pinknoise.wav synth 4 pinknoise
+
 2021-08-11  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -2267 +2267 @@
 [ Monterey ] imported/w3c/web-platform-tests/html/canvas/element/imagebitmap/createImageBitmap-serializable.html [ Timeout ]
 
-# rdar://80344665 ([ Monterey ] webaudio/codec-tests/mp3/128kbps-44khz.html is a constant audio failure)
-[ Monterey ] webaudio/codec-tests/mp3/128kbps-44khz.html [ Failure ]
+[ BigSur Monterey ] webaudio/codec-tests/mp3/128kbps-44khz.html [ Pass ]
+[ BigSur Monterey ] webaudio/Panner/hrtf-database.html [ Pass ]
+[ BigSur Monterey ] webaudio/codec-tests/aac/vbr-128kbps-44khz.html [ Pass ]
 
 # rdar://80347712 ([ Monterey ] media/video-src-blob-replay.html is a flaky timeout)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-11  Jean-Yves Avenard  <jya@apple.com>
+
+        Audio buffer may contain more frames than decoded.
+        https://bugs.webkit.org/show_bug.cgi?id=228732
+        rdar://problem/81447014
+
+        Reviewed by Eric Carlson.
+
+        It is necessary to call repeatedly ExtAudioFileRead until it explicitly indicates that
+        it reached EOF.
+        Test: webaudio/decode-audio-data-wav.html.
+
+        * platform/audio/cocoa/AudioFileReaderCocoa.cpp:
+        (WebCore::AudioFileReader::createBus): Ensure that all frames have been decoded and
+        trim length to the actual number of frames returned.
+        This was already done for the webm case.
+
 2021-08-11  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/audio/cocoa/AudioFileReaderCocoa.cpp

@@ -577 +577 @@
         if (!decodedFrames)
             return nullptr;
-        // The actual decoded number of frames may not match the number of frames calculated
-        // while demuxing as frames can be trimmed. It will always be lower.
-        audioBus->setLength(*decodedFrames);
         numberOfFrames = *decodedFrames;
 #endif
@@ -587 +584 @@
 
         // Read from the file (or in-memory version)
-        UInt32 framesToRead = numberOfFrames;
-        if (PAL::ExtAudioFileRead(m_extAudioFileRef, &framesToRead, bufferList) != noErr)
-            return nullptr;
-    }
+        size_t framesLeftToRead = numberOfFrames;
+        size_t framesRead = 0;
+        UInt32 framesToRead;
+        do {
+            framesToRead = std::min<size_t>(std::numeric_limits<UInt32>::max(), framesLeftToRead);
+            if (PAL::ExtAudioFileRead(m_extAudioFileRef, &framesToRead, bufferList) != noErr)
+                return nullptr;
+            framesRead += framesToRead;
+            RELEASE_ASSERT(framesRead <= numberOfFrames, "We read more than what we have room for");
+            framesLeftToRead -= framesToRead;
+            for (size_t i = 0; i < numberOfChannels; ++i) {
+                bufferList->mBuffers[i].mDataByteSize = (numberOfFrames - framesRead) * sizeof(float);
+                bufferList->mBuffers[i].mData = static_cast<float*>(bufferList->mBuffers[i].mData) + framesToRead;
+            }
+        } while (framesToRead);
+        numberOfFrames = framesRead;
+    }
+
+    // The actual decoded number of frames may not match the number of frames calculated
+    // while demuxing as frames can be trimmed. It will always be lower.
+    audioBus->setLength(numberOfFrames);
 
     if (mixToMono && numberOfChannels == 2) {