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

Commit 6f264ac0 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Audio policy: new media volume curve for speaker with DRC"

parents a78df959 ccd8e4a9

services/audiopolicy/AudioPolicyManager.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -3983,6 +3983,11 @@ const AudioPolicyManager::VolumeCurvePoint 
    {1, -56.0f}, {20, -34.0f}, {60, -11.0f}, {100, 0.0f}

    {1, -56.0f}, {20, -34.0f}, {60, -11.0f}, {100, 0.0f}

};

};





const AudioPolicyManager::VolumeCurvePoint

    AudioPolicyManager::sSpeakerMediaVolumeCurveDrc[AudioPolicyManager::VOLCNT] = {

    {1, -56.0f}, {20, -34.0f}, {86, -10.0f}, {100, 0.0f}

};



const AudioPolicyManager::VolumeCurvePoint

const AudioPolicyManager::VolumeCurvePoint

    AudioPolicyManager::sSpeakerSonificationVolumeCurve[AudioPolicyManager::VOLCNT] = {

    AudioPolicyManager::sSpeakerSonificationVolumeCurve[AudioPolicyManager::VOLCNT] = {

    {1, -29.7f}, {33, -20.1f}, {66, -10.2f}, {100, 0.0f}

    {1, -29.7f}, {33, -20.1f}, {66, -10.2f}, {100, 0.0f}
@@ -4097,6 +4102,8 @@ void AudioPolicyManager::initializeVolumeCurves() 
                sSpeakerSonificationVolumeCurveDrc;

                sSpeakerSonificationVolumeCurveDrc;

        mStreams[AUDIO_STREAM_NOTIFICATION].mVolumeCurve[DEVICE_CATEGORY_SPEAKER] =

        mStreams[AUDIO_STREAM_NOTIFICATION].mVolumeCurve[DEVICE_CATEGORY_SPEAKER] =

                sSpeakerSonificationVolumeCurveDrc;

                sSpeakerSonificationVolumeCurveDrc;

        mStreams[AUDIO_STREAM_MUSIC].mVolumeCurve[DEVICE_CATEGORY_SPEAKER] =

                sSpeakerMediaVolumeCurveDrc;

    }

    }

}

}

services/audiopolicy/AudioPolicyManager.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -373,6 +373,7 @@ protected: 
        static const VolumeCurvePoint sDefaultMediaVolumeCurve[AudioPolicyManager::VOLCNT];

        static const VolumeCurvePoint sDefaultMediaVolumeCurve[AudioPolicyManager::VOLCNT];

        // volume curve for media strategy on speakers

        // volume curve for media strategy on speakers

        static const VolumeCurvePoint sSpeakerMediaVolumeCurve[AudioPolicyManager::VOLCNT];

        static const VolumeCurvePoint sSpeakerMediaVolumeCurve[AudioPolicyManager::VOLCNT];

        static const VolumeCurvePoint sSpeakerMediaVolumeCurveDrc[AudioPolicyManager::VOLCNT];

        // volume curve for sonification strategy on speakers

        // volume curve for sonification strategy on speakers

        static const VolumeCurvePoint sSpeakerSonificationVolumeCurve[AudioPolicyManager::VOLCNT];

        static const VolumeCurvePoint sSpeakerSonificationVolumeCurve[AudioPolicyManager::VOLCNT];

        static const VolumeCurvePoint sSpeakerSonificationVolumeCurveDrc[AudioPolicyManager::VOLCNT];

        static const VolumeCurvePoint sSpeakerSonificationVolumeCurveDrc[AudioPolicyManager::VOLCNT];