Merge "Spatializer: Move priority configuration to threadLoop" into main (c7328cc4) · Commits · e / os / android_frameworks_av

services/audioflinger/Threads.cpp

+12 −15

Original line number	Original line	Diff line number	Diff line
	@@ -3918,6 +3918,18 @@ NO_THREAD_SAFETY_ANALYSIS // manual locking of AudioFlinger
	{		{
	aflog::setThreadWriter(mNBLogWriter.get());		aflog::setThreadWriter(mNBLogWriter.get());

			if (mType == SPATIALIZER) {
			const pid_t tid = getTid();
			if (tid == -1) { // odd: we are here, we must be a running thread.
			ALOGW("%s: Cannot update Spatializer mixer thread priority, no tid", __func__);
			} else {
			const int priorityBoost = requestSpatializerPriority(getpid(), tid);
			if (priorityBoost > 0) {
			stream()->setHalThreadPriority(priorityBoost);
			}
			}
			}

	Vector<sp<IAfTrack>> tracksToRemove;		Vector<sp<IAfTrack>> tracksToRemove;

	mStandbyTimeNs = systemTime();		mStandbyTimeNs = systemTime();
	@@ -7778,21 +7790,6 @@ SpatializerThread::SpatializerThread(const sp<IAfThreadCallback>& afThreadCallba
	{		{
	}		}

	void SpatializerThread::onFirstRef() {
	MixerThread::onFirstRef();

	const pid_t tid = getTid();
	if (tid == -1) {
	// Unusual: PlaybackThread::onFirstRef() should set the threadLoop running.
	ALOGW("%s: Cannot update Spatializer mixer thread priority, not running", __func__);
	} else {
	const int priorityBoost = requestSpatializerPriority(getpid(), tid);
	if (priorityBoost > 0) {
	stream()->setHalThreadPriority(priorityBoost);
	}
	}
	}

	void SpatializerThread::setHalLatencyMode_l() {		void SpatializerThread::setHalLatencyMode_l() {
	// if mSupportedLatencyModes is empty, the HAL stream does not support		// if mSupportedLatencyModes is empty, the HAL stream does not support
	// latency mode control and we can exit.		// latency mode control and we can exit.

services/audioflinger/Threads.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1806,9 +1806,6 @@ public:

	bool hasFastMixer() const final { return false; }		bool hasFastMixer() const final { return false; }

	// RefBase
	void onFirstRef() final;

	status_t setRequestedLatencyMode(audio_latency_mode_t mode) final;		status_t setRequestedLatencyMode(audio_latency_mode_t mode) final;

	protected:		protected: