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

Commit 0912a573 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Fix effect and mono sink handling." into lmp-dev

parents 317bb916 389cfdbb

services/audioflinger/AudioFlinger.h

+2 −1
Original line number Diff line number Diff line
@@ -343,7 +343,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;

    }