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

Commit 6af1c1dc authored by Eric Laurent's avatar Eric Laurent
Browse files

audio policy: modify ringone volume attenuation over headset. 

Do not limit ringtone volume over headseet when combined with speaker and
no music is playing.

bug: 26769982

Change-Id: I5309bf0d672cca67c69a15b73ee2ef34a220d42a
parent 8c808a22

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+7 −2
Original line number Diff line number Diff line
@@ -4880,7 +4880,9 @@ float AudioPolicyManager::computeVolume(audio_stream_type_t stream, 
    float volumeDb = mVolumeCurves->volIndexToDb(stream, Volume::getDeviceCategory(device), index);

    // 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 ring tones and notifications volume by 6dB

    // - always attenuate notifications volume by 6dB

    // - attenuate ring tones volume by 6dB unless music is not playing and

    // speaker is part of the select devices

    // - if music is playing, always limit the volume to current music volume,

    // with a minimum threshold at -36dB so that notification is always perceived.

    const routing_strategy stream_strategy = getStrategy(stream);
@@ -4894,12 +4896,12 @@ float AudioPolicyManager::computeVolume(audio_stream_type_t stream, 
                || ((stream_strategy == STRATEGY_ENFORCED_AUDIBLE) &&

                    (mEngine->getForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM) == AUDIO_POLICY_FORCE_NONE))) &&

            mVolumeCurves->canBeMuted(stream)) {

        volumeDb += SONIFICATION_HEADSET_VOLUME_FACTOR_DB;

        // when the phone is ringing we must consider that music could have been paused just before

        // by the music application and behave as if music was active if the last music track was

        // just stopped

        if (isStreamActive(AUDIO_STREAM_MUSIC, SONIFICATION_HEADSET_MUSIC_DELAY) ||

                mLimitRingtoneVolume) {

            volumeDb += SONIFICATION_HEADSET_VOLUME_FACTOR_DB;

            audio_devices_t musicDevice = getDeviceForStrategy(STRATEGY_MEDIA, true /*fromCache*/);

            float musicVolDB = computeVolume(AUDIO_STREAM_MUSIC,

                                             mVolumeCurves->getVolumeIndex(AUDIO_STREAM_MUSIC,
@@ -4911,6 +4913,9 @@ float AudioPolicyManager::computeVolume(audio_stream_type_t stream, 
                volumeDb = minVolDB;

                ALOGV("computeVolume limiting volume to %f musicVol %f", minVolDB, musicVolDB);

            }

        } else if ((Volume::getDeviceForVolume(device) != AUDIO_DEVICE_OUT_SPEAKER) ||

                stream_strategy != STRATEGY_SONIFICATION) {

            volumeDb += SONIFICATION_HEADSET_VOLUME_FACTOR_DB;

        }

    }

services/audiopolicy/managerdefault/AudioPolicyManager.h

+0 −2
Original line number Diff line number Diff line
@@ -49,10 +49,8 @@ namespace android { 
// ----------------------------------------------------------------------------



// Attenuation applied to STRATEGY_SONIFICATION streams when a headset is connected: 6dB

#define SONIFICATION_HEADSET_VOLUME_FACTOR 0.5

#define SONIFICATION_HEADSET_VOLUME_FACTOR_DB (-6)

// Min volume for STRATEGY_SONIFICATION streams when limited by music volume: -36dB

#define SONIFICATION_HEADSET_VOLUME_MIN  0.016

#define SONIFICATION_HEADSET_VOLUME_MIN_DB  (-36)



// Time in milliseconds during which we consider that music is still active after a music