DO NOT MERGE - improve audio effect framwework thread safety (5717bb1a) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+19 −6

Original line number	Diff line number	Diff line
		@@ -2257,6 +2257,18 @@ void AudioFlinger::releaseAudioSessionId(int audioSession, pid_t pid)
		ALOGW_IF(caller != getpid_cached, "session id %d not found for pid %d", audioSession, caller);
		}

		bool AudioFlinger::isSessionAcquired_l(int audioSession)
		{
		size_t num = mAudioSessionRefs.size();
		for (size_t i = 0; i < num; i++) {
		AudioSessionRef *ref = mAudioSessionRefs.itemAt(i);
		if (ref->mSessionid == audioSession) {
		return true;
		}
		}
		return false;
		}

		void AudioFlinger::purgeStaleEffects_l() {

		ALOGV("purging stale effects");
		@@ -2597,8 +2609,9 @@ sp<IEffect> AudioFlinger::createEffect(
		sp<Client> client = registerPid(pid);

		// create effect on selected output thread
		bool pinned = (sessionId > AUDIO_SESSION_OUTPUT_MIX) && isSessionAcquired_l(sessionId);
		handle = thread->createEffect_l(client, effectClient, priority, sessionId,
		&desc, enabled, &lStatus);
		&desc, enabled, &lStatus, pinned);
		if (handle != 0 && id != NULL) {
		*id = handle->id();
		}
		@@ -2798,8 +2811,8 @@ bool AudioFlinger::updateOrphanEffectChains(const sp<AudioFlinger::EffectModule>
		ALOGV("updateOrphanEffectChains session %d index %d", session, index);
		if (index >= 0) {
		sp<EffectChain> chain = mOrphanEffectChains.valueAt(index);
		if (chain->removeEffect_l(effect) == 0) {
		ALOGV("updateOrphanEffectChains removing effect chain at index %d", index);
		if (chain->removeEffect_l(effect, true) == 0) {
		ALOGV("updateOrphanEffectChains removing effect chain at index %zd", index);
		mOrphanEffectChains.removeItemsAt(index);
		}
		return true;

services/audioflinger/AudioFlinger.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -568,6 +568,7 @@ private:
		void removeNotificationClient(pid_t pid);
		bool isNonOffloadableGlobalEffectEnabled_l();
		void onNonOffloadableGlobalEffectEnable();
		bool isSessionAcquired_l(int audioSession);

		// Store an effect chain to mOrphanEffectChains keyed vector.
		// Called when a thread exits and effects are still attached to it.

services/audioflinger/Effects.cpp

+164 −93

File changed.

Preview size limit exceeded, changes collapsed.

services/audioflinger/Effects.h

+26 −11

Original line number	Diff line number	Diff line
		@@ -45,7 +45,8 @@ public:
		const wp<AudioFlinger::EffectChain>& chain,
		effect_descriptor_t *desc,
		int id,
		int sessionId);
		int sessionId,
		bool pinned);
		virtual ~EffectModule();

		enum effect_state {
		@@ -93,8 +94,9 @@ public:
		const wp<ThreadBase>& thread() { return mThread; }

		status_t addHandle(EffectHandle *handle);
		size_t disconnect(EffectHandle *handle, bool unpinIfLast);
		size_t removeHandle(EffectHandle *handle);
		ssize_t disconnectHandle(EffectHandle *handle, bool unpinIfLast);
		ssize_t removeHandle(EffectHandle *handle);
		ssize_t removeHandle_l(EffectHandle *handle);

		const effect_descriptor_t& desc() const { return mDescriptor; }
		wp<EffectChain>& chain() { return mChain; }
		@@ -120,6 +122,7 @@ public:
		status_t setOffloaded(bool offloaded, audio_io_handle_t io);
		bool isOffloaded() const;
		void addEffectToHal_l();
		void release_l();

		void dump(int fd, const Vector<String16>& args);

		@@ -204,12 +207,17 @@ public:
		bool enabled() const { return mEnabled; }

		// Getters
		int id() const { return mEffect->id(); }
		wp<EffectModule> effect() const { return mEffect; }
		int id() const {
		sp<EffectModule> effect = mEffect.promote();
		if (effect == 0) {
		return 0;
		}
		return effect->id();
		}
		int priority() const { return mPriority; }
		bool hasControl() const { return mHasControl; }
		sp<EffectModule> effect() const { return mEffect; }
		// destroyed_l() must be called with the associated EffectModule mLock held
		bool destroyed_l() const { return mDestroyed; }
		bool disconnected() const { return mDisconnected; }

		void dumpToBuffer(char* buffer, size_t size);

		@@ -218,7 +226,8 @@ protected:
		EffectHandle(const EffectHandle&);
		EffectHandle& operator =(const EffectHandle&);

		sp<EffectModule> mEffect; // pointer to controlled EffectModule
		Mutex mLock; // protects IEffect method calls
		wp<EffectModule> mEffect; // pointer to controlled EffectModule
		sp<IEffectClient> mEffectClient; // callback interface for client notifications
		/const/ sp<Client> mClient; // client for shared memory allocation, see disconnect()
		sp<IMemory> mCblkMemory; // shared memory for control block
		@@ -229,8 +238,7 @@ protected:
		bool mHasControl; // true if this handle is controlling the effect
		bool mEnabled; // cached enable state: needed when the effect is
		// restored after being suspended
		bool mDestroyed; // Set to true by destructor. Access with EffectModule
		// mLock held
		bool mDisconnected; // Set to true by disconnect()
		};

		// the EffectChain class represents a group of effects associated to one audio session.
		@@ -263,8 +271,15 @@ public:
		mLock.unlock();
		}

		status_t createEffect_l(sp<EffectModule>& effect,
		ThreadBase *thread,
		effect_descriptor_t *desc,
		int id,
		int sessionId,
		bool pinned);
		status_t addEffect_l(const sp<EffectModule>& handle);
		size_t removeEffect_l(const sp<EffectModule>& handle);
		status_t addEffect_ll(const sp<EffectModule>& handle);
		size_t removeEffect_l(const sp<EffectModule>& handle, bool release = false);

		int sessionId() const { return mSessionId; }
		void setSessionId(int sessionId) { mSessionId = sessionId; }

services/audioflinger/Threads.cpp

+33 −12

File changed.

Preview size limit exceeded, changes collapsed.