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

Commit 7ef5bb92 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "Audio policy: volume computation improvement on A2DP for notifications" into nyc-dev 

am: 5d364cac

* commit '5d364cac':
  Audio policy: volume computation improvement on A2DP for notifications

Change-Id: I8cd7b9b2ee536eb10fd2c5001acc6cb2d86affe6
parents 597c1c00 5d364cac

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+18 −6
Original line number Diff line number Diff line
@@ -4898,7 +4898,7 @@ float AudioPolicyManager::computeVolume(audio_stream_type_t stream, 
                                        int index,

                                        audio_devices_t device)

{

    float volumeDb = mVolumeCurves->volIndexToDb(stream, Volume::getDeviceCategory(device), index);

    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 notifications volume by 6dB
@@ -4922,7 +4922,7 @@ float AudioPolicyManager::computeVolume(audio_stream_type_t stream, 
        // just stopped

        if (isStreamActive(AUDIO_STREAM_MUSIC, SONIFICATION_HEADSET_MUSIC_DELAY) ||

                mLimitRingtoneVolume) {

            volumeDb += SONIFICATION_HEADSET_VOLUME_FACTOR_DB;

            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,
@@ -4930,17 +4930,29 @@ float AudioPolicyManager::computeVolume(audio_stream_type_t stream, 
                                             musicDevice);

            float minVolDB = (musicVolDB > SONIFICATION_HEADSET_VOLUME_MIN_DB) ?

                    musicVolDB : SONIFICATION_HEADSET_VOLUME_MIN_DB;

            if (volumeDb > minVolDB) {

                volumeDb = minVolDB;

            if (volumeDB > minVolDB) {

                volumeDB = minVolDB;

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

            }

            if (device & (AUDIO_DEVICE_OUT_BLUETOOTH_A2DP |

                    AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES)) {

                // on A2DP, also ensure notification volume is not too low compared to media when

                // intended to be played

                if ((volumeDB > -96.0f) &&

                        (musicVolDB - SONIFICATION_A2DP_MAX_MEDIA_DIFF_DB > volumeDB)) {

                    ALOGV("computeVolume increasing volume for stream=%d device=0x%X from %f to %f",

                            stream, device,

                            volumeDB, musicVolDB - SONIFICATION_A2DP_MAX_MEDIA_DIFF_DB);

                    volumeDB = musicVolDB - SONIFICATION_A2DP_MAX_MEDIA_DIFF_DB;

                }

            }

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

                stream_strategy != STRATEGY_SONIFICATION) {

            volumeDb += SONIFICATION_HEADSET_VOLUME_FACTOR_DB;

            volumeDB += SONIFICATION_HEADSET_VOLUME_FACTOR_DB;

        }

    }



    return volumeDb;

    return volumeDB;

}



status_t AudioPolicyManager::checkAndSetVolume(audio_stream_type_t stream,

services/audiopolicy/managerdefault/AudioPolicyManager.h

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ namespace android { 
#define SONIFICATION_HEADSET_VOLUME_FACTOR_DB (-6)

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

#define SONIFICATION_HEADSET_VOLUME_MIN_DB  (-36)

// Max volume difference on A2DP between playing media and STRATEGY_SONIFICATION streams: 12dB

#define SONIFICATION_A2DP_MAX_MEDIA_DIFF_DB (12)



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

// track was stopped - see computeVolume()