Merge "APM: cap earpiece voice in call by voice volume" into oc-dr1-dev (a7a28931) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+29 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,11 @@ namespace android {
		//FIXME: workaround for truncated touch sounds
		// to be removed when the problem is handled by system UI
		#define TOUCH_SOUND_FIXED_DELAY_MS 100

		// Largest difference in dB on earpiece in call between the voice volume and another
		// media / notification / system volume.
		constexpr float IN_CALL_EARPIECE_HEADROOM_DB = 3.f;

		// ----------------------------------------------------------------------------
		// AudioPolicyInterface implementation
		// ----------------------------------------------------------------------------
		@@ -5348,6 +5353,30 @@ float AudioPolicyManager::computeVolume(audio_stream_type_t stream,
		return ringVolumeDB - 4 > volumeDB ? ringVolumeDB - 4 : volumeDB;
		}

		// in-call: always cap earpiece volume by voice volume + some low headroom
		if ((stream != AUDIO_STREAM_VOICE_CALL) && (device & AUDIO_DEVICE_OUT_EARPIECE) && isInCall()) {
		switch (stream) {
		case AUDIO_STREAM_SYSTEM:
		case AUDIO_STREAM_RING:
		case AUDIO_STREAM_MUSIC:
		case AUDIO_STREAM_ALARM:
		case AUDIO_STREAM_NOTIFICATION:
		case AUDIO_STREAM_ENFORCED_AUDIBLE:
		case AUDIO_STREAM_DTMF:
		case AUDIO_STREAM_ACCESSIBILITY: {
		const float maxVoiceVolDb = computeVolume(AUDIO_STREAM_VOICE_CALL, index, device)
		+ IN_CALL_EARPIECE_HEADROOM_DB;
		if (volumeDB > maxVoiceVolDb) {
		ALOGV("computeVolume() stream %d at vol=%f overriden by stream %d at vol=%f",
		stream, volumeDB, AUDIO_STREAM_VOICE_CALL, maxVoiceVolDb);
		volumeDB = maxVoiceVolDb;
		}
		} break;
		default:
		break;
		}
		}

		// if a headset is connected, apply the following rules to ring tones and notifications
		// to avoid sound level bursts in user's ears:
		// - always attenuate notifications volume by 6dB