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

Commit 18c7ad17 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "disable audio balance in voip call for mono channel" am: aa35085d am: 90a5afaa 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2390553



Change-Id: I83549af690318d2db781407178314b658221eeb1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f80b3f4 90a5afaa

services/audioflinger/Threads.cpp

+7 −2
Original line number Diff line number Diff line
@@ -6205,12 +6205,17 @@ void AudioFlinger::DirectOutputThread::processVolume_l(Track *track, bool lastTr 
        if (left > GAIN_FLOAT_UNITY) {

            left = GAIN_FLOAT_UNITY;

        }

        left *= v * mMasterBalanceLeft; // DirectOutputThread balance applied as track volume

        right = float_from_gain(gain_minifloat_unpack_right(vlr));

        if (right > GAIN_FLOAT_UNITY) {

            right = GAIN_FLOAT_UNITY;

        }

        right *= v * mMasterBalanceRight;

        left *= v;

        right *= v;

        if (mAudioFlinger->getMode() != AUDIO_MODE_IN_COMMUNICATION

                || audio_channel_count_from_out_mask(mChannelMask) > 1) {

            left *= mMasterBalanceLeft; // DirectOutputThread balance applied as track volume

            right *= mMasterBalanceRight;

        }

    }



    if (lastTrack) {