commit 0afdd8032ea71241a9d6041fdb58325d968491cc
author Andy Hung <hunga@google.com> Thu Nov 16 18:09:23 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 16 18:09:23 2023 +0000
tree b60f0d28c6051874a75182460cca61c5ddc942cc
parent 61ff90cc752a00287e3823a57e57c533bcfb8766
parent 1058702bb33b846a09341527fea7f87cb3253cdb

Merge "AudioRecord:read() memcpy non PCM audio buffers" into main

media/libaudioclient/AudioRecord.cpp

diff --git a/media/libaudioclient/AudioRecord.cpp b/media/libaudioclient/AudioRecord.cpp
index c912d27..91bc700 100644
--- a/media/libaudioclient/AudioRecord.cpp
+++ b/media/libaudioclient/AudioRecord.cpp
@@ -1225,8 +1225,12 @@
         }
 
         size_t bytesRead = audioBuffer.frameCount * mFrameSize;
-        memcpy_by_audio_format(buffer, mFormat, audioBuffer.raw, mServerConfig.format,
-                               audioBuffer.mSize / mServerSampleSize);
+        if (audio_is_linear_pcm(mFormat)) {
+            memcpy_by_audio_format(buffer, mFormat, audioBuffer.raw, mServerConfig.format,
+                                audioBuffer.mSize / mServerSampleSize);
+        } else {
+            memcpy(buffer, audioBuffer.raw, audioBuffer.mSize);
+        }
         buffer = ((char *) buffer) + bytesRead;
         userSize -= bytesRead;
         read += bytesRead;