commit 2debdc96d8a65ffef9ce74f65f53fdbe4c9d585c
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 10 20:09:08 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 10 20:09:08 2023 +0000
tree f72cafbe0b98995687ebc6c7142af01a021c71f7
parent 702417d7971fdc2ddf137971260c68d3124bfb38
parent ad99fb0150ad327ed780a27ee10b3806bac87749

Merge "audio: reply correct transferred bytes"

media/libaudiohal/impl/StreamHalAidl.cpp

diff --git a/media/libaudiohal/impl/StreamHalAidl.cpp b/media/libaudiohal/impl/StreamHalAidl.cpp
index a97bd02..17b3c2e 100644
--- a/media/libaudiohal/impl/StreamHalAidl.cpp
+++ b/media/libaudiohal/impl/StreamHalAidl.cpp
@@ -286,12 +286,13 @@
     if (status_t status = sendCommand(burst, &reply); status != OK) {
         return status;
     }
+    *transferred = reply.fmqByteCount;
     if (mIsInput) {
-        *transferred = reply.fmqByteCount;
         LOG_ALWAYS_FATAL_IF(*transferred > bytes,
                 "%s: HAL module read %zu bytes, which exceeds requested count %zu",
                 __func__, *transferred, bytes);
-        if (!mContext.getDataMQ()->read(static_cast<int8_t*>(buffer), *transferred)) {
+        if (!mContext.getDataMQ()->read(static_cast<int8_t*>(buffer),
+                                        mContext.getDataMQ()->availableToRead())) {
             ALOGE("%s: failed to read %zu bytes to data MQ", __func__, *transferred);
             return NOT_ENOUGH_DATA;
         }