commit 9e2376ebbe9d9ddf5e692ce4e340aafb6a56b890
author Daniel Van Veen <dvanv@dolby.com> Thu Sep 27 14:37:58 2018 +1000
committer Mikhail Naganov <mnaganov@google.com> Thu Sep 27 11:05:24 2018 -0700
tree eabe8df6826f6ff33a2f1db2d32398814eec742f
parent a9e84bc851221c34c0a8a3355636fa7b38efa3a5

audio: Fix memcpy num bytes for direct RecordThread

The num bytes to copy was missing frame size multiplier.

Test: MSD prototype
Bug: 63901775
Change-Id: I1606bcf41b81d841f39b19512cc7b019c50662d5

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index d7a4451..13ca912 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -6963,7 +6963,7 @@
                                 framesIn, mSampleRate, activeTrack->mSampleRate));
 
                 if (activeTrack->isDirect()) {
-                    // No RecordBufferConverter used for compressed formats. Pass
+                    // No RecordBufferConverter used for direct streams. Pass
                     // straight from RecordThread buffer to RecordTrack buffer.
                     AudioBufferProvider::Buffer buffer;
                     buffer.frameCount = framesOut;
@@ -6973,7 +6973,7 @@
                                 "%s() read less than expected (%zu vs %zu)",
                                 __func__, buffer.frameCount, framesOut);
                         framesOut = buffer.frameCount;
-                        memcpy(activeTrack->mSink.raw, buffer.raw, buffer.frameCount);
+                        memcpy(activeTrack->mSink.raw, buffer.raw, buffer.frameCount * mFrameSize);
                         activeTrack->mResamplerBufferProvider->releaseBuffer(&buffer);
                     } else {
                         framesOut = 0;