commit 3d6d39d35e1282cb3fde3759986b6a76aab8f982
author Vlad Popa <pvlad@google.com> Wed Dec 21 18:59:16 2022 +0100
committer Vlad Popa <pvlad@google.com> Wed Dec 21 19:14:18 2022 +0100
tree 600275d7ae6c0f3dfc5f5aa266e700d3485e3784
parent 1d5f0d5cfb05b79940ee19e4881fb669901b52a9

CSD: Add logic for forcing the use of internal MEL

This flag should be used for testing purposes only. Sometimes it might
make sense to disable the HAL sound dose interface to test the internal
MEL computation and sound dose logic end-2-end.

Test: sounddosemanager_tests UT
Bug: 248565894
Change-Id: Ieaf506511c0aee3b9a5a262831b950d9dcaf3535

services/audioflinger/MelReporter.cpp

diff --git a/services/audioflinger/MelReporter.cpp b/services/audioflinger/MelReporter.cpp
index 7902444..b185959 100644
--- a/services/audioflinger/MelReporter.cpp
+++ b/services/audioflinger/MelReporter.cpp
@@ -33,8 +33,14 @@
 constexpr std::string_view kSoundDoseInterfaceModule = "/default";
 
 bool AudioFlinger::MelReporter::activateHalSoundDoseComputation(const std::string& module) {
+    if (mSoundDoseManager->forceUseFrameworkMel()) {
+        ALOGD("%s: Forcing use of internal MEL computation.", __func__);
+        activateInternalSoundDoseComputation();
+        return false;
+    }
+
     if (mSoundDoseFactory == nullptr) {
-        ALOGW("%s sound dose HAL reporting not available", __func__);
+        ALOGW("%s: sound dose HAL reporting not available", __func__);
         activateInternalSoundDoseComputation();
         return false;
     }
@@ -42,14 +48,14 @@
     std::shared_ptr<ISoundDose> soundDoseInterface;
     auto result = mSoundDoseFactory->getSoundDose(module, &soundDoseInterface);
     if (!result.isOk()) {
-        ALOGW("%s HAL cannot provide sound dose interface for module %s",
+        ALOGW("%s: HAL cannot provide sound dose interface for module %s",
               __func__, module.c_str());
         activateInternalSoundDoseComputation();
         return false;
     }
 
     if (!mSoundDoseManager->setHalSoundDoseInterface(soundDoseInterface)) {
-        ALOGW("%s cannot activate HAL MEL reporting for module %s", __func__, module.c_str());
+        ALOGW("%s: cannot activate HAL MEL reporting for module %s", __func__, module.c_str());
         activateInternalSoundDoseComputation();
         return false;
     }
@@ -61,10 +67,16 @@
 }
 
 void AudioFlinger::MelReporter::activateInternalSoundDoseComputation() {
-    mSoundDoseManager->setHalSoundDoseInterface(nullptr);
+    {
+        std::lock_guard _l(mLock);
+        if (!mUseHalSoundDoseInterface) {
+            // no need to start internal MEL on active patches
+            return;
+        }
+        mUseHalSoundDoseInterface = false;
+    }
 
-    std::lock_guard _l(mLock);
-    mUseHalSoundDoseInterface = false;
+    mSoundDoseManager->setHalSoundDoseInterface(nullptr);
 
     for (const auto& activePatches : mActiveMelPatches) {
         for (const auto& deviceId : activePatches.second.deviceHandles) {
@@ -88,7 +100,7 @@
 }
 
 bool AudioFlinger::MelReporter::shouldComputeMelForDeviceType(audio_devices_t device) {
-    if (mSoundDoseManager->computeCsdOnAllDevices()) {
+    if (mSoundDoseManager->forceComputeCsdOnAllDevices()) {
         return true;
     }
 
@@ -130,10 +142,10 @@
                                     patch.mAudioPatch.sinks[i].ext.device.address};
             mSoundDoseManager->mapAddressToDeviceId(adt, deviceId);
 
-            bool useHalSoundDoseInterface;
+            bool useHalSoundDoseInterface = !mSoundDoseManager->forceUseFrameworkMel();
             {
                 std::lock_guard _l(mLock);
-                useHalSoundDoseInterface = mUseHalSoundDoseInterface;
+                useHalSoundDoseInterface &= mUseHalSoundDoseInterface;
             }
             if (!useHalSoundDoseInterface) {
                 startMelComputationForNewPatch(streamHandle, deviceId);