Merge "audioflinger: Remove effect from hal before closing." (c961cd4d) · Commits · e / os / android_frameworks_av

services/audioflinger/Effects.cpp

+3 −14

Original line number	Diff line number	Diff line
		@@ -291,6 +291,9 @@ ssize_t AudioFlinger::EffectBase::removeHandle_l(EffectHandle *handle)
		}
		}

		// Prevent calls to process() and other functions on effect interface from now on.
		// The effect engine will be released by the destructor when the last strong reference on
		// this object is released which can happen after next process is called.
		if (mHandles.size() == 0 && !mPinned) {
		mState = DESTROYED;
		}
		@@ -564,20 +567,6 @@ AudioFlinger::EffectModule::~EffectModule()

		}

		ssize_t AudioFlinger::EffectModule::removeHandle_l(EffectHandle *handle)
		{
		ssize_t status = EffectBase::removeHandle_l(handle);

		// Prevent calls to process() and other functions on effect interface from now on.
		// The effect engine will be released by the destructor when the last strong reference on
		// this object is released which can happen after next process is called.
		if (status == 0 && !mPinned) {
		mEffectInterface->close();
		}

		return status;
		}

		bool AudioFlinger::EffectModule::updateState() {
		Mutex::Autolock _l(mLock);

+1 −3

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ public:
		status_t addHandle(EffectHandle *handle);
		ssize_t disconnectHandle(EffectHandle *handle, bool unpinIfLast);
		ssize_t removeHandle(EffectHandle *handle);
		virtual ssize_t removeHandle_l(EffectHandle *handle);
		ssize_t removeHandle_l(EffectHandle *handle);
		EffectHandle* controlHandle_l();
		bool purgeHandles();

		@@ -240,8 +240,6 @@ public:
		return mOutBuffer != 0 ? reinterpret_cast<int16_t*>(mOutBuffer->ptr()) : NULL;
		}

		ssize_t removeHandle_l(EffectHandle *handle) override;

		status_t setDevices(const AudioDeviceTypeAddrVector &devices);
		status_t setInputDevice(const AudioDeviceTypeAddr &device);
		status_t setVolume(uint32_t left, uint32_t right, bool controller);