Merge "disable audio balance in voip call for mono channel" (aa35085d) · Commits · e / os / android_frameworks_av

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) {