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

Commit ac29afac authored by Jon Eklund's avatar Jon Eklund Committed by Vineeta Srivastava
Browse files

audio policy: support line output device 

Change-Id: Iddf1b6486430270d871a45c75615e54339a818e9
parent 85c37730

services/audiopolicy/AudioPolicyManager.cpp

+34 −11
Original line number Diff line number Diff line
@@ -3706,6 +3706,8 @@ audio_devices_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strate 
                device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET;

                if (device) break;

            }

            device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_LINE;

            if (device) break;

            device = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_SPEAKER;

            if (device) break;

            device = mDefaultOutputDevice->mDeviceType;
@@ -3762,6 +3764,9 @@ audio_devices_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strate 
        if (device2 == AUDIO_DEVICE_NONE) {

            device2 = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_WIRED_HEADPHONE;

        }

        if ((device2 == AUDIO_DEVICE_NONE)) {

            device2 = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_LINE;

        }

        if (device2 == AUDIO_DEVICE_NONE) {

            device2 = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_WIRED_HEADSET;

        }
@@ -4295,10 +4300,13 @@ AudioPolicyManager::device_category AudioPolicyManager::getDeviceCategory(audio_ 
        case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP:

        case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES:

            return DEVICE_CATEGORY_HEADSET;

        case AUDIO_DEVICE_OUT_LINE:

        case AUDIO_DEVICE_OUT_AUX_DIGITAL:

        /*USB?  Remote submix?*/

            return DEVICE_CATEGORY_EXT_MEDIA;

        case AUDIO_DEVICE_OUT_SPEAKER:

        case AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT:

        case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER:

        case AUDIO_DEVICE_OUT_AUX_DIGITAL:

        case AUDIO_DEVICE_OUT_USB_ACCESSORY:

        case AUDIO_DEVICE_OUT_USB_DEVICE:

        case AUDIO_DEVICE_OUT_REMOTE_SUBMIX:
@@ -4364,6 +4372,11 @@ const AudioPolicyManager::VolumeCurvePoint 
    {1, -58.0f}, {20, -40.0f}, {60, -17.0f}, {100, 0.0f}

};



const AudioPolicyManager::VolumeCurvePoint

    AudioPolicyManager::sExtMediaSystemVolumeCurve[AudioPolicyManager::VOLCNT] = {

    {1, -58.0f}, {20, -40.0f}, {60, -21.0f}, {100, -10.0f}

};



const AudioPolicyManager::VolumeCurvePoint

    AudioPolicyManager::sSpeakerMediaVolumeCurve[AudioPolicyManager::VOLCNT] = {

    {1, -56.0f}, {20, -34.0f}, {60, -11.0f}, {100, 0.0f}
@@ -4420,52 +4433,62 @@ const AudioPolicyManager::VolumeCurvePoint 
    { // AUDIO_STREAM_VOICE_CALL

        sDefaultVoiceVolumeCurve, // DEVICE_CATEGORY_HEADSET

        sSpeakerVoiceVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        sDefaultVoiceVolumeCurve  // DEVICE_CATEGORY_EARPIECE

        sDefaultVoiceVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

    { // AUDIO_STREAM_SYSTEM

        sHeadsetSystemVolumeCurve, // DEVICE_CATEGORY_HEADSET

        sDefaultSystemVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        sDefaultSystemVolumeCurve  // DEVICE_CATEGORY_EARPIECE

        sDefaultSystemVolumeCurve,  // DEVICE_CATEGORY_EARPIECE

        sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

    { // AUDIO_STREAM_RING

        sDefaultVolumeCurve, // DEVICE_CATEGORY_HEADSET

        sSpeakerSonificationVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        sDefaultVolumeCurve  // DEVICE_CATEGORY_EARPIECE

        sDefaultVolumeCurve,  // DEVICE_CATEGORY_EARPIECE

        sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

    { // AUDIO_STREAM_MUSIC

        sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_HEADSET

        sSpeakerMediaVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EARPIECE

        sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

    { // AUDIO_STREAM_ALARM

        sDefaultVolumeCurve, // DEVICE_CATEGORY_HEADSET

        sSpeakerSonificationVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        sDefaultVolumeCurve  // DEVICE_CATEGORY_EARPIECE

        sDefaultVolumeCurve,  // DEVICE_CATEGORY_EARPIECE

        sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

    { // AUDIO_STREAM_NOTIFICATION

        sDefaultVolumeCurve, // DEVICE_CATEGORY_HEADSET

        sSpeakerSonificationVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        sDefaultVolumeCurve  // DEVICE_CATEGORY_EARPIECE

        sDefaultVolumeCurve,  // DEVICE_CATEGORY_EARPIECE

        sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

    { // AUDIO_STREAM_BLUETOOTH_SCO

        sDefaultVoiceVolumeCurve, // DEVICE_CATEGORY_HEADSET

        sSpeakerVoiceVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        sDefaultVoiceVolumeCurve  // DEVICE_CATEGORY_EARPIECE

        sDefaultVoiceVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

    { // AUDIO_STREAM_ENFORCED_AUDIBLE

        sHeadsetSystemVolumeCurve, // DEVICE_CATEGORY_HEADSET

        sDefaultSystemVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        sDefaultSystemVolumeCurve  // DEVICE_CATEGORY_EARPIECE

        sDefaultSystemVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

    {  // AUDIO_STREAM_DTMF

        sHeadsetSystemVolumeCurve, // DEVICE_CATEGORY_HEADSET

        sDefaultSystemVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        sDefaultSystemVolumeCurve  // DEVICE_CATEGORY_EARPIECE

        sDefaultSystemVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

    { // AUDIO_STREAM_TTS

        sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_HEADSET

        sSpeakerMediaVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EARPIECE

        sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

};

services/audiopolicy/AudioPolicyManager.h

+3 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ protected: 
            DEVICE_CATEGORY_HEADSET,

            DEVICE_CATEGORY_SPEAKER,

            DEVICE_CATEGORY_EARPIECE,

            DEVICE_CATEGORY_EXT_MEDIA,

            DEVICE_CATEGORY_CNT

        };
@@ -414,6 +415,8 @@ protected: 
        static const VolumeCurvePoint sDefaultVolumeCurve[AudioPolicyManager::VOLCNT];

        // default volume curve for media strategy

        static const VolumeCurvePoint sDefaultMediaVolumeCurve[AudioPolicyManager::VOLCNT];

        // volume curve for non-media audio on ext media outputs (HDMI, Line, etc)

        static const VolumeCurvePoint sExtMediaSystemVolumeCurve[AudioPolicyManager::VOLCNT];

        // volume curve for media strategy on speakers

        static const VolumeCurvePoint sSpeakerMediaVolumeCurve[AudioPolicyManager::VOLCNT];

        static const VolumeCurvePoint sSpeakerMediaVolumeCurveDrc[AudioPolicyManager::VOLCNT];