commit 214c86e5223920f1fa45e631c1291562645f6d50
author Jindong Yue <jindong.yue@nxp.com> Mon Oct 21 13:42:29 2024 +0800
committer Mikhail Naganov <mnaganov@google.com> Tue Oct 22 21:02:34 2024 +0000
tree 116d475b09f66adb5651c29eb54ba6f3314518f5
parent 5c7e78b8eeb5319e766db71c0e739cbc35a7a2d1

audio: Add warning log for unmatched mixer values

Compare the mixer control values set by the user with the values
retrieved from the hardware, and log a warning if they do not match.

This check is meaningful because of the integer division involved in
converting between percentage and hardware values in tinyalsa, which
can lead to small discrepancies due to rounding.

Bug: 375030900
Test: build locally
Change-Id: If396a5cedc768f2bab5db055b5cf875143e3c23b
Signed-off-by: Jindong Yue <jindong.yue@nxp.com>

audio/aidl/default/primary/StreamPrimary.cpp

diff --git a/audio/aidl/default/primary/StreamPrimary.cpp b/audio/aidl/default/primary/StreamPrimary.cpp
index 0ad60eb..46e384e 100644
--- a/audio/aidl/default/primary/StreamPrimary.cpp
+++ b/audio/aidl/default/primary/StreamPrimary.cpp
@@ -242,6 +242,14 @@
         mHwGains = currentGains;
         return status;
     }
+    float gain;
+    RETURN_STATUS_IF_ERROR(primary::PrimaryMixer::getInstance().getMicGain(&gain));
+    // Due to rounding errors, round trip conversions between percents and indexed values may not
+    // match.
+    if (gain != in_channelGains[0]) {
+        LOG(WARNING) << __func__ << ": unmatched gain: set: " << in_channelGains[0]
+                     << ", from mixer: " << gain;
+    }
     return ndk::ScopedAStatus::ok();
 }
 
@@ -275,6 +283,15 @@
         mHwVolumes = currentVolumes;
         return status;
     }
+    std::vector<float> volumes;
+    RETURN_STATUS_IF_ERROR(primary::PrimaryMixer::getInstance().getVolumes(&volumes));
+    // Due to rounding errors, round trip conversions between percents and indexed values may not
+    // match.
+    if (volumes != in_channelVolumes) {
+        LOG(WARNING) << __func__ << ": unmatched volumes: set: "
+                     << ::android::internal::ToString(in_channelVolumes)
+                     << ", from mixer: " << ::android::internal::ToString(volumes);
+    }
     return ndk::ScopedAStatus::ok();
 }