CSD: When testing use random port id
This is necessary since all the patches that were called before CSD is
forced on all devices will be unknown to the sound dose mActiveDevices.
Since we are forcing the CSD on all devices using -1 as the reported
port id.
Test: atest GtsAudioTestCases:SoundDoseTest
Bug: 301527435
Change-Id: I8010d0e2b36700ee7245e60950700f65dcd198cb
diff --git a/services/audioflinger/MelReporter.cpp b/services/audioflinger/MelReporter.cpp
index a9c868e..41c5096 100644
--- a/services/audioflinger/MelReporter.cpp
+++ b/services/audioflinger/MelReporter.cpp
@@ -30,7 +30,7 @@
bool MelReporter::activateHalSoundDoseComputation(const std::string& module,
const sp<DeviceHalInterface>& device) {
- if (mSoundDoseManager->forceUseFrameworkMel()) {
+ if (mSoundDoseManager->isFrameworkMelForced()) {
ALOGD("%s: Forcing use of internal MEL computation.", __func__);
activateInternalSoundDoseComputation();
return false;
@@ -318,7 +318,7 @@
}
bool MelReporter::useHalSoundDoseInterface_l() {
- return !mSoundDoseManager->forceUseFrameworkMel() & mUseHalSoundDoseInterface;
+ return !mSoundDoseManager->isFrameworkMelForced() & mUseHalSoundDoseInterface;
}
std::string MelReporter::dump() {
diff --git a/services/audioflinger/sounddose/SoundDoseManager.cpp b/services/audioflinger/sounddose/SoundDoseManager.cpp
index 39c80d8..92bf3b3 100644
--- a/services/audioflinger/sounddose/SoundDoseManager.cpp
+++ b/services/audioflinger/sounddose/SoundDoseManager.cpp
@@ -33,6 +33,10 @@
namespace {
+// Port handle used when CSD is computed on all devices. Should be a different value than
+// AUDIO_PORT_HANDLE_NONE which is associated with a sound dose callback failure
+constexpr audio_port_handle_t CSD_ON_ALL_DEVICES_PORT_HANDLE = -1;
+
int64_t getMonotonicSecond() {
struct timespec now_ts;
if (clock_gettime(CLOCK_MONOTONIC, &now_ts) != 0) {
@@ -175,6 +179,13 @@
}
audio_port_handle_t SoundDoseManager::getIdForAudioDevice(const AudioDevice& audioDevice) const {
+ if (isComputeCsdForcedOnAllDevices()) {
+ // If CSD is forced on all devices return random port id. Used only in testing.
+ // This is necessary since the patches that are registered before
+ // setComputeCsdOnAllDevices will not be contributing to mActiveDevices
+ return CSD_ON_ALL_DEVICES_PORT_HANDLE;
+ }
+
const std::lock_guard _l(mLock);
audio_devices_t type;
@@ -491,7 +502,7 @@
ALOGV("%s csd is disabled", __func__);
return false;
}
- if (forceComputeCsdOnAllDevices()) {
+ if (isComputeCsdForcedOnAllDevices()) {
return true;
}
@@ -515,7 +526,7 @@
ALOGV("%s csd is disabled", __func__);
return false;
}
- if (forceComputeCsdOnAllDevices()) {
+ if (isComputeCsdForcedOnAllDevices()) {
return true;
}
@@ -536,7 +547,7 @@
mUseFrameworkMel = useFrameworkMel;
}
-bool SoundDoseManager::forceUseFrameworkMel() const {
+bool SoundDoseManager::isFrameworkMelForced() const {
const std::lock_guard _l(mLock);
return mUseFrameworkMel;
}
@@ -546,7 +557,7 @@
mComputeCsdOnAllDevices = computeCsdOnAllDevices;
}
-bool SoundDoseManager::forceComputeCsdOnAllDevices() const {
+bool SoundDoseManager::isComputeCsdForcedOnAllDevices() const {
const std::lock_guard _l(mLock);
return mComputeCsdOnAllDevices;
}
diff --git a/services/audioflinger/sounddose/SoundDoseManager.h b/services/audioflinger/sounddose/SoundDoseManager.h
index 6e0bc34..347eabe 100644
--- a/services/audioflinger/sounddose/SoundDoseManager.h
+++ b/services/audioflinger/sounddose/SoundDoseManager.h
@@ -136,8 +136,8 @@
// used for testing only
size_t getCachedMelRecordsSize() const;
- bool forceUseFrameworkMel() const;
- bool forceComputeCsdOnAllDevices() const;
+ bool isFrameworkMelForced() const;
+ bool isComputeCsdForcedOnAllDevices() const;
/** Method for converting from audio_utils::CsdRecord to media::SoundDoseRecord. */
static media::SoundDoseRecord csdRecordToSoundDoseRecord(const audio_utils::CsdRecord& legacy);
diff --git a/services/audioflinger/sounddose/tests/sounddosemanager_tests.cpp b/services/audioflinger/sounddose/tests/sounddosemanager_tests.cpp
index 5f6dcb9..294080b 100644
--- a/services/audioflinger/sounddose/tests/sounddosemanager_tests.cpp
+++ b/services/audioflinger/sounddose/tests/sounddosemanager_tests.cpp
@@ -262,11 +262,11 @@
}
TEST_F(SoundDoseManagerTest, GetDefaultForceComputeCsdOnAllDevices) {
- EXPECT_FALSE(mSoundDoseManager->forceComputeCsdOnAllDevices());
+ EXPECT_FALSE(mSoundDoseManager->isComputeCsdForcedOnAllDevices());
}
TEST_F(SoundDoseManagerTest, GetDefaultForceUseFrameworkMel) {
- EXPECT_FALSE(mSoundDoseManager->forceUseFrameworkMel());
+ EXPECT_FALSE(mSoundDoseManager->isFrameworkMelForced());
}
TEST_F(SoundDoseManagerTest, SetAudioDeviceCategoryStopsNonHeadphone) {