Changeset 284980 in webkit

Timestamp:

Oct 28, 2021, 8:32:57 AM (5 years ago)

Author:

youenn@apple.com

Message:

Fix CARingBuffer mix mode
​https://bugs.webkit.org/show_bug.cgi?id=232427
Source/WebCore:

Reviewed by Eric Carlson.

Like done for Copy, we need to use the destination offset to write data properly.

Covered by API test.

• platform/audio/cocoa/CARingBuffer.cpp:

Tools:

<rdar://problem/84747657>

Reviewed by Eric Carlson.

• TestWebKitAPI/Tests/WebCore/CARingBuffer.cpp:

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/audio/cocoa/CARingBuffer.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/CARingBuffer.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-28  Youenn Fablet  <youenn@apple.com>
+
+        Fix CARingBuffer mix mode
+        https://bugs.webkit.org/show_bug.cgi?id=232427
+
+        Reviewed by Eric Carlson.
+
+        Like done for Copy, we need to use the destination offset to write data properly.
+
+        Covered by API test.
+
+        * platform/audio/cocoa/CARingBuffer.cpp:
+
 2021-10-28  Youenn Fablet  <youenn@apple.com>
 

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

@@ -167 +167 @@
             continue;
 
+        auto* destinationData = static_cast<Byte*>(dest->mData) + destOffset;
+        auto* sourceData = pointer + srcOffset;
         nbytes = std::min<size_t>(nbytes, dest->mDataByteSize - destOffset);
         if (mode == CARingBuffer::Copy)
-            memcpy(static_cast<Byte*>(dest->mData) + destOffset, pointer + srcOffset, nbytes);
+            memcpy(destinationData, sourceData, nbytes);
         else {
             switch (format) {
             case AudioStreamDescription::Int16: {
-                int16_t* destination = static_cast<int16_t*>(dest->mData);
-                int16_t* source = reinterpret_cast<int16_t*>(pointer + srcOffset);
+                auto* destination = reinterpret_cast<int16_t*>(destinationData);
+                auto* source = reinterpret_cast<int16_t*>(sourceData);
                 for (size_t i = 0; i < nbytes / sizeof(int16_t); i++)
                     destination[i] += source[i];
@@ -180 +182 @@
             }
             case AudioStreamDescription::Int32: {
-                int32_t* destination = static_cast<int32_t*>(dest->mData);
-                vDSP_vaddi(destination, 1, reinterpret_cast<int32_t*>(pointer + srcOffset), 1, destination, 1, nbytes / sizeof(int32_t));
+                auto* destination = reinterpret_cast<int32_t*>(destinationData);
+                vDSP_vaddi(destination, 1, reinterpret_cast<int32_t*>(sourceData), 1, destination, 1, nbytes / sizeof(int32_t));
                 break;
             }
             case AudioStreamDescription::Float32: {
-                float* destination = static_cast<float*>(dest->mData);
-                vDSP_vadd(destination, 1, reinterpret_cast<float*>(pointer + srcOffset), 1, destination, 1, nbytes / sizeof(float));
+                auto* destination = reinterpret_cast<float*>(destinationData);
+                vDSP_vadd(destination, 1, reinterpret_cast<float*>(sourceData), 1, destination, 1, nbytes / sizeof(float));
                 break;
             }
             case AudioStreamDescription::Float64: {
-                double* destination = static_cast<double*>(dest->mData);
-                vDSP_vaddD(destination, 1, reinterpret_cast<double*>(pointer + srcOffset), 1, destination, 1, nbytes / sizeof(double));
+                auto* destination = reinterpret_cast<double*>(destinationData);
+                vDSP_vaddD(destination, 1, reinterpret_cast<double*>(sourceData), 1, destination, 1, nbytes / sizeof(double));
                 break;
             }

trunk/Tools/ChangeLog

@@ +1 @@
+2021-10-28  Youenn Fablet  <youenn@apple.com>
+
+        Fix CARingBuffer mix mode
+        https://bugs.webkit.org/show_bug.cgi?id=232427
+        <rdar://problem/84747657>
+
+        Reviewed by Eric Carlson.
+
+        * TestWebKitAPI/Tests/WebCore/CARingBuffer.cpp:
+
 2021-10-28  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/CARingBuffer.cpp

@@ -153 +153 @@
     static void run(CARingBufferTest& test)
     {
-        const int sampleCount = 64;
+        const int sampleCount = 441;
 
         CAAudioStreamDescription::PCMFormat format;
@@ -198 +198 @@
         for (int i = 0; i < sampleCount; i++)
             EXPECT_EQ(readBuffer[i], referenceBuffer[i]) << "Ring buffer value differs at index " << i;
+
+        test.ringBuffer().fetch(&test.bufferList(), sampleCount, 0, CARingBuffer::FetchMode::Copy);
+        err = test.ringBuffer().store(&test.bufferList(), sampleCount, sampleCount);
+        EXPECT_EQ(err, CARingBuffer::Error::Ok);
+
+        test.ringBuffer().fetch(&test.bufferList(), sampleCount, sampleCount, CARingBuffer::FetchMode::Copy);
+        test.ringBuffer().fetch(&test.bufferList(), sampleCount, sampleCount, CARingBuffer::FetchMode::Mix);
+        test.ringBuffer().fetch(&test.bufferList(), sampleCount, sampleCount, CARingBuffer::FetchMode::Mix);
+
+        for (int i = 0; i < sampleCount; i++)
+            referenceBuffer[i] = sourceBuffer[i] * 3;
+
+        for (int i = 0; i < sampleCount; i++)
+            EXPECT_EQ(readBuffer[i], referenceBuffer[i]) << "Ring buffer value differs at index " << i;
     }
 };