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

Commit 5fd52ad5 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Hearing Aid volume curve am: 24b0a892 

am: 17ed5808

Change-Id: Ib4f2336cedb4ccd47715b245d6d1bd41cdbc23ca
parents f113f958 17ed5808

services/audiopolicy/common/include/Volume.h

+3 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ enum device_category { 
    DEVICE_CATEGORY_SPEAKER,

    DEVICE_CATEGORY_EARPIECE,

    DEVICE_CATEGORY_EXT_MEDIA,

    DEVICE_CATEGORY_HEARING_AID,

    DEVICE_CATEGORY_CNT

};
@@ -125,8 +126,9 @@ public: 
        case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP:

        case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES:

        case AUDIO_DEVICE_OUT_USB_HEADSET:

        case AUDIO_DEVICE_OUT_HEARING_AID:

            return DEVICE_CATEGORY_HEADSET;

        case AUDIO_DEVICE_OUT_HEARING_AID:

            return DEVICE_CATEGORY_HEARING_AID;

        case AUDIO_DEVICE_OUT_LINE:

        case AUDIO_DEVICE_OUT_AUX_DIGITAL:

        case AUDIO_DEVICE_OUT_USB_DEVICE:

services/audiopolicy/common/managerdefinitions/src/Gains.cpp

+31 −13
Original line number Diff line number Diff line
@@ -113,86 +113,104 @@ Gains::sFullScaleVolumeCurve[Volume::VOLCNT] = { 
    {0, 0.0f}, {1, 0.0f}, {2, 0.0f}, {100, 0.0f}

};



const VolumeCurvePoint

Gains::sHearingAidVolumeCurve[Volume::VOLCNT] = {

    {1, -128.0f}, {20, -80.0f}, {60, -40.0f}, {100, 0.0f}

};



const VolumeCurvePoint *Gains::sVolumeProfiles[AUDIO_STREAM_CNT]

                                                  [DEVICE_CATEGORY_CNT] = {

    { // AUDIO_STREAM_VOICE_CALL

        Gains::sDefaultVoiceVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sSpeakerVoiceVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sSpeakerVoiceVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        Gains::sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sHearingAidVolumeCurve     // DEVICE_CATEGORY_HEARING_AID

    },

    { // AUDIO_STREAM_SYSTEM

        Gains::sHeadsetSystemVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sDefaultSystemVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sDefaultSystemVolumeCurve,  // DEVICE_CATEGORY_EARPIECE

        Gains::sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sExtMediaSystemVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sHearingAidVolumeCurve       // DEVICE_CATEGORY_HEARING_AID

    },

    { // AUDIO_STREAM_RING

        Gains::sDefaultVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sSpeakerSonificationVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sDefaultVolumeCurve,  // DEVICE_CATEGORY_EARPIECE

        Gains::sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sExtMediaSystemVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sHearingAidVolumeCurve // DEVICE_CATEGORY_HEARING_AID

    },

    { // AUDIO_STREAM_MUSIC

        Gains::sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sSpeakerMediaVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        Gains::sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sHearingAidVolumeCurve     // DEVICE_CATEGORY_HEARING_AID

    },

    { // AUDIO_STREAM_ALARM

        Gains::sDefaultVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sSpeakerSonificationVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sDefaultVolumeCurve,  // DEVICE_CATEGORY_EARPIECE

        Gains::sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sExtMediaSystemVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sHearingAidVolumeCurve // DEVICE_CATEGORY_HEARING_AID

    },

    { // AUDIO_STREAM_NOTIFICATION

        Gains::sDefaultVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sSpeakerSonificationVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sDefaultVolumeCurve,  // DEVICE_CATEGORY_EARPIECE

        Gains::sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sExtMediaSystemVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sHearingAidVolumeCurve // DEVICE_CATEGORY_HEARING_AID

    },

    { // AUDIO_STREAM_BLUETOOTH_SCO

        Gains::sDefaultVoiceVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sSpeakerVoiceVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sDefaultVoiceVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        Gains::sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sHearingAidVolumeCurve      // DEVICE_CATEGORY_HEARING_AID

    },

    { // AUDIO_STREAM_ENFORCED_AUDIBLE

        Gains::sHeadsetSystemVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sDefaultSystemVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sDefaultSystemVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        Gains::sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sExtMediaSystemVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sHearingAidVolumeCurve       // DEVICE_CATEGORY_HEARING_AID

    },

    {  // AUDIO_STREAM_DTMF

        Gains::sHeadsetSystemVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sDefaultSystemVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sDefaultSystemVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        Gains::sExtMediaSystemVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sExtMediaSystemVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sHearingAidVolumeCurve       // DEVICE_CATEGORY_HEARING_AID

    },

    { // AUDIO_STREAM_TTS

      // "Transmitted Through Speaker": always silent except on DEVICE_CATEGORY_SPEAKER

        Gains::sSilentVolumeCurve,    // DEVICE_CATEGORY_HEADSET

        Gains::sFullScaleVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sSilentVolumeCurve,    // DEVICE_CATEGORY_EARPIECE

        Gains::sSilentVolumeCurve     // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sSilentVolumeCurve,    // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sHearingAidVolumeCurve  // DEVICE_CATEGORY_HEARING_AID

    },

    { // AUDIO_STREAM_ACCESSIBILITY

        Gains::sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sSpeakerMediaVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        Gains::sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sHearingAidVolumeCurve     // DEVICE_CATEGORY_HEARING_AID

    },

    { // AUDIO_STREAM_REROUTING

        Gains::sFullScaleVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sFullScaleVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sFullScaleVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        Gains::sFullScaleVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sFullScaleVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sFullScaleVolumeCurve  // DEVICE_CATEGORY_HEARING_AID

    },

    { // AUDIO_STREAM_PATCH

        Gains::sFullScaleVolumeCurve, // DEVICE_CATEGORY_HEADSET

        Gains::sFullScaleVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        Gains::sFullScaleVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        Gains::sFullScaleVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sFullScaleVolumeCurve, // DEVICE_CATEGORY_EXT_MEDIA

        Gains::sFullScaleVolumeCurve  // DEVICE_CATEGORY_HEARING_AID

    },

};

services/audiopolicy/common/managerdefinitions/src/TypeConverter.cpp

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ const DeviceCategoryConverter::Table DeviceCategoryConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(DEVICE_CATEGORY_SPEAKER),

    MAKE_STRING_FROM_ENUM(DEVICE_CATEGORY_EARPIECE),

    MAKE_STRING_FROM_ENUM(DEVICE_CATEGORY_EXT_MEDIA),

    MAKE_STRING_FROM_ENUM(DEVICE_CATEGORY_HEARING_AID),

    TERMINATOR

};

services/audiopolicy/config/audio_policy_volumes.xml

+26 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ volume index from 0 to 100. 
    </volume>

    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                             ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                             ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET">

        <point>1,-3000</point>

        <point>33,-2600</point>
@@ -55,6 +57,8 @@ volume index from 0 to 100. 
                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                         ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                         ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                       ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
@@ -67,6 +71,8 @@ volume index from 0 to 100. 
                                       ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                       ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                       ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER"
@@ -75,6 +81,8 @@ volume index from 0 to 100. 
                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                        ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                        ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
@@ -87,6 +95,8 @@ volume index from 0 to 100. 
                                        ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                        ref="DEFAULT_NON_MUTABLE_EXT_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                        ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                               ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
@@ -99,6 +109,8 @@ volume index from 0 to 100. 
                                               ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                               ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                               ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEADSET">

        <point>0,-4200</point>

        <point>33,-2800</point>
@@ -119,6 +131,8 @@ volume index from 0 to 100. 
    </volume>

    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                                ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEADSET">

        <point>1,-3000</point>

        <point>33,-2600</point>
@@ -131,6 +145,8 @@ volume index from 0 to 100. 
                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                                   ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                                   ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEADSET">

        <point>1,-3000</point>

        <point>33,-2600</point>
@@ -143,6 +159,8 @@ volume index from 0 to 100. 
                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                       ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                       ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                      ref="SILENT_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_SPEAKER"
@@ -151,6 +169,8 @@ volume index from 0 to 100. 
                                      ref="SILENT_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                      ref="SILENT_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                      ref="SILENT_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_SPEAKER"
@@ -159,6 +179,8 @@ volume index from 0 to 100. 
                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                                ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                            ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_SPEAKER"
@@ -167,6 +189,8 @@ volume index from 0 to 100. 
                                            ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                            ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                            ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEADSET"

                                        ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_SPEAKER"
@@ -175,5 +199,7 @@ volume index from 0 to 100. 
                                        ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

                                        ref="FULL_SCALE_VOLUME_CURVE"/>

    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEARING_AID"

                                        ref="FULL_SCALE_VOLUME_CURVE"/>

</volumes>

services/audiopolicy/config/default_volume_tables.xml

+25 −10
Original line number Diff line number Diff line
@@ -67,6 +67,13 @@ 
        <point>60,-2100</point>

        <point>100,-1000</point>

    </reference>

    <reference name="DEFAULT_HEARING_AID_VOLUME_CURVE">

    <!-- Default Hearing Aid Volume Curve -->

        <point>1,-12700</point>

        <point>20,-8000</point>

        <point>60,-4000</point>

        <point>100,0</point>

    </reference>

    <!-- **************************************************************** -->

    <!-- Non-mutable default volume curves:                               -->

    <!--     * first point is always for index 0                          -->
@@ -111,4 +118,12 @@ 
        <point>60,-2100</point>

        <point>100,-1000</point>

    </reference>

    <reference name="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE">

    <!-- Default non-mutable Hearing Aid Volume Curve -->

    <!--     based on DEFAULT_HEARING_AID_VOLUME_CURVE -->

        <point>0,-12700</point>

        <point>20,-8000</point>

        <point>60,-4000</point>

        <point>100,0</point>

    </reference>

</volumes>