Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 389cfdbb authored Aug 07, 2014 by Andy Hung

Fix effect and mono sink handling.

Do not permit mixing to mono sink in AudioFlinger.
Allow effects on mono sink if not Mixer thread (e.g. Record).

Bug: 16863095
Change-Id: I8b232fc1fb3f07bf017020c5d4f9ace644dec6d8

parent 92ce4715

services/audioflinger/AudioFlinger.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -340,7 +340,8 @@ private:
		uint32_t channelCount = FCC_2; // stereo is default
		if (kEnableExtendedChannels) {
		channelCount = audio_channel_count_from_out_mask(channelMask);
		if (channelCount > AudioMixer::MAX_NUM_CHANNELS) {
		if (channelCount < FCC_2 // mono is not supported at this time
		\|\| channelCount > AudioMixer::MAX_NUM_CHANNELS) {
		return false;
		}
		}

services/audioflinger/Threads.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -910,11 +910,11 @@ sp<AudioFlinger::EffectHandle> AudioFlinger::ThreadBase::createEffect_l(
		goto Exit;
		}

		// Reject any effect on multichannel sinks.
		// Reject any effect on mixer or duplicating multichannel sinks.
		// TODO: fix both format and multichannel issues with effects.
		if (mChannelCount != FCC_2) {
		ALOGW("createEffect_l() Cannot add effect %s for multichannel(%d) thread",
		desc->name, mChannelCount);
		if ((mType == MIXER \|\| mType == DUPLICATING) && mChannelCount != FCC_2) {
		ALOGW("createEffect_l() Cannot add effect %s for multichannel(%d) %s threads",
		desc->name, mChannelCount, mType == MIXER ? "MIXER" : "DUPLICATING");
		lStatus = BAD_VALUE;
		goto Exit;
		}