Merge "Fix bug in creation of EffectHandle when out of memory" (480acec4) · Commits · e / os / android_frameworks_av

services/audioflinger/Effects.cpp

+10 −8

Original line number	Diff line number	Diff line
		@@ -912,18 +912,15 @@ AudioFlinger::EffectHandle::EffectHandle(const sp<EffectModule>& effect,
		}
		int bufOffset = ((sizeof(effect_param_cblk_t) - 1) / sizeof(int) + 1) * sizeof(int);
		mCblkMemory = client->heap()->allocate(EFFECT_PARAM_BUFFER_SIZE + bufOffset);
		if (mCblkMemory != 0) {
		mCblk = static_cast<effect_param_cblk_t *>(mCblkMemory->pointer());

		if (mCblk != NULL) {
		new(mCblk) effect_param_cblk_t();
		mBuffer = (uint8_t *)mCblk + bufOffset;
		}
		} else {
		if (mCblkMemory == 0 \|\|
		(mCblk = static_cast<effect_param_cblk_t *>(mCblkMemory->pointer())) == NULL) {
		ALOGE("not enough memory for Effect size=%u", EFFECT_PARAM_BUFFER_SIZE +
		sizeof(effect_param_cblk_t));
		mCblkMemory.clear();
		return;
		}
		new(mCblk) effect_param_cblk_t();
		mBuffer = (uint8_t *)mCblk + bufOffset;
		}

		AudioFlinger::EffectHandle::~EffectHandle()
		@@ -940,6 +937,11 @@ AudioFlinger::EffectHandle::~EffectHandle()
		disconnect(false);
		}

		status_t AudioFlinger::EffectHandle::initCheck()
		{
		return mClient == 0 \|\| mCblkMemory != 0 ? OK : NO_MEMORY;
		}

		status_t AudioFlinger::EffectHandle::enable()
		{
		ALOGV("enable %p", this);

+1 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,7 @@ public:
		const sp<IEffectClient>& effectClient,
		int32_t priority);
		virtual ~EffectHandle();
		virtual status_t initCheck();

		// IEffect
		virtual status_t enable();

+4 −1

Original line number	Diff line number	Diff line
		@@ -846,7 +846,10 @@ sp<AudioFlinger::EffectHandle> AudioFlinger::ThreadBase::createEffect_l(
		}
		// create effect handle and connect it to effect module
		handle = new EffectHandle(effect, client, effectClient, priority);
		lStatus = handle->initCheck();
		if (lStatus == OK) {
		lStatus = effect->addHandle(handle.get());
		}
		if (enabled != NULL) {
		*enabled = (int)effect->isEnabled();
		}