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

Commit 90a5afaa 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 

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



Change-Id: I2285be6f164902b969ba46aaa8eac37a9b8202c1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85ada5e3 aa35085d

services/audioflinger/Threads.cpp

+7 −2
Original line number Diff line number Diff line
@@ -6196,12 +6196,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) {