From cbde2d0940cda564092538ec8d3703776bef032f Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Wed, 11 Jan 2023 12:08:43 -0800 Subject: [PATCH] Effect: Move thread priority updates from threadLoop Now updated in prepareForProcessing(), which avoids race with close(). Test: atest AudioEffectTest Test: Run spatial audio Test: adb shell 'uclampset -a -p $(pgrep -of android.hardware.audio.service)' Bug: 265055114 Change-Id: I31de38d54aa42d7ae3cc87d0afc4a410fc3336ad --- audio/effect/all-versions/default/Effect.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/audio/effect/all-versions/default/Effect.cpp b/audio/effect/all-versions/default/Effect.cpp index 87e1ab7a7d..5aecd324eb 100644 --- a/audio/effect/all-versions/default/Effect.cpp +++ b/audio/effect/all-versions/default/Effect.cpp @@ -240,16 +240,6 @@ class ProcessThread : public Thread { }; bool ProcessThread::threadLoop() { - // For a spatializer effect, we perform scheduler adjustments to reduce glitches and power. - { - effect_descriptor_t halDescriptor{}; - if ((*mEffect)->get_descriptor(mEffect, &halDescriptor) == NO_ERROR && - memcmp(&halDescriptor.type, FX_IID_SPATIALIZER, sizeof(effect_uuid_t)) == 0) { - const status_t status = scheduler::updateSpatializerPriority(gettid()); - ALOGW_IF(status != OK, "Failed to update Spatializer priority"); - } - } - // This implementation doesn't return control back to the Thread until it decides to stop, // as the Thread uses mutexes, and this can lead to priority inversion. while (!std::atomic_load_explicit(mStop, std::memory_order_acquire)) { @@ -570,6 +560,15 @@ Return Effect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) { return Void(); } + // For a spatializer effect, we perform scheduler adjustments to reduce glitches and power. + // We do it here instead of the ProcessThread::threadLoop to ensure that mHandle is valid. + if (effect_descriptor_t halDescriptor{}; + (*mHandle)->get_descriptor(mHandle, &halDescriptor) == NO_ERROR && + memcmp(&halDescriptor.type, FX_IID_SPATIALIZER, sizeof(effect_uuid_t)) == 0) { + const status_t status = scheduler::updateSpatializerPriority(mProcessThread->getTid()); + ALOGW_IF(status != OK, "Failed to update Spatializer priority"); + } + mStatusMQ = std::move(tempStatusMQ); _hidl_cb(Result::OK, *mStatusMQ->getDesc()); return Void();