Merge "Effect: Move thread priority updates from threadLoop" into tm-qpr-dev (8f12fe90) · Commits · e / os / android_hardware_interfaces

audio/effect/all-versions/default/Effect.cpp

+9 −10

Original line number	Diff line number	Diff line
		@@ -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<void> 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();