Merge "audio policy: fix output session effect leak" into qt-dev (0a8f199b) · Commits · e / os / android_frameworks_av

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+30 −26

Original line number	Diff line number	Diff line
		@@ -225,6 +225,21 @@ status_t AudioPolicyService::getOutputForAttr(const audio_attributes_t *original
		return result;
		}

		void AudioPolicyService::getPlaybackClientAndEffects(audio_port_handle_t portId,
		sp<AudioPlaybackClient>& client,
		sp<AudioPolicyEffects>& effects,
		const char *context)
		{
		Mutex::Autolock _l(mLock);
		const ssize_t index = mAudioPlaybackClients.indexOfKey(portId);
		if (index < 0) {
		ALOGE("%s AudioTrack client not found for portId %d", context, portId);
		return;
		}
		client = mAudioPlaybackClients.valueAt(index);
		effects = mAudioPolicyEffects;
		}

		status_t AudioPolicyService::startOutput(audio_port_handle_t portId)
		{
		if (mAudioPolicyManager == NULL) {
		@@ -233,16 +248,9 @@ status_t AudioPolicyService::startOutput(audio_port_handle_t portId)
		ALOGV("startOutput()");
		sp<AudioPlaybackClient> client;
		sp<AudioPolicyEffects>audioPolicyEffects;
		{
		Mutex::Autolock _l(mLock);
		const ssize_t index = mAudioPlaybackClients.indexOfKey(portId);
		if (index < 0) {
		ALOGE("%s AudioTrack client not found for portId %d", __FUNCTION__, portId);
		return INVALID_OPERATION;
		}
		client = mAudioPlaybackClients.valueAt(index);
		audioPolicyEffects = mAudioPolicyEffects;
		}

		getPlaybackClientAndEffects(portId, client, audioPolicyEffects, __func__);

		if (audioPolicyEffects != 0) {
		// create audio processors according to stream
		status_t status = audioPolicyEffects->addOutputSessionEffects(
		@@ -275,17 +283,9 @@ status_t AudioPolicyService::doStopOutput(audio_port_handle_t portId)
		ALOGV("doStopOutput");
		sp<AudioPlaybackClient> client;
		sp<AudioPolicyEffects>audioPolicyEffects;
		{
		Mutex::Autolock _l(mLock);

		const ssize_t index = mAudioPlaybackClients.indexOfKey(portId);
		if (index < 0) {
		ALOGE("%s AudioTrack client not found for portId %d", __FUNCTION__, portId);
		return INVALID_OPERATION;
		}
		client = mAudioPlaybackClients.valueAt(index);
		audioPolicyEffects = mAudioPolicyEffects;
		}
		getPlaybackClientAndEffects(portId, client, audioPolicyEffects, __func__);

		if (audioPolicyEffects != 0) {
		// release audio processors from the stream
		status_t status = audioPolicyEffects->releaseOutputSessionEffects(
		@@ -315,13 +315,17 @@ void AudioPolicyService::releaseOutput(audio_port_handle_t portId)
		void AudioPolicyService::doReleaseOutput(audio_port_handle_t portId)
		{
		ALOGV("doReleaseOutput from tid %d", gettid());
		Mutex::Autolock _l(mLock);
		const ssize_t index = mAudioPlaybackClients.indexOfKey(portId);
		if (index < 0) {
		ALOGE("%s AudioTrack client not found for portId %d", __FUNCTION__, portId);
		return;
		sp<AudioPlaybackClient> client;
		sp<AudioPolicyEffects> audioPolicyEffects;

		getPlaybackClientAndEffects(portId, client, audioPolicyEffects, __func__);

		if (audioPolicyEffects != 0 && client->active) {
		// clean up effects if output was not stopped before being released
		audioPolicyEffects->releaseOutputSessionEffects(
		client->io, client->stream, client->session);
		}
		sp<AudioPlaybackClient> client = mAudioPlaybackClients.valueAt(index);
		Mutex::Autolock _l(mLock);
		mAudioPlaybackClients.removeItem(portId);

		// called from internal thread: no need to clear caller identity

services/audiopolicy/service/AudioPolicyService.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -782,6 +782,12 @@ private:
		const audio_stream_type_t stream;
		};

		void getPlaybackClientAndEffects(audio_port_handle_t portId,
		sp<AudioPlaybackClient>& client,
		sp<AudioPolicyEffects>& effects,
		const char *context);


		// A class automatically clearing and restoring binder caller identity inside
		// a code block (scoped variable)
		// Declare one systematically before calling AudioPolicyManager methods so that they are