diff options
author | Tobias Jahnke <tobias.jahnke@microchip.com> | 2017-12-14 14:47:14 +0100 |
---|---|---|
committer | Tobias Jahnke <tobias.jahnke@microchip.com> | 2017-12-14 15:09:39 +0100 |
commit | 0de32c82973b0934a499fb737cf178955d211ccb (patch) | |
tree | fe2528527ddec005f815ddf1b2cee0af88208d6f | |
parent | 60cc0019a2c39316a7a74e86ffb8e574c618125b (diff) |
4a-hal-unicens: add missing audio roles for 4a
Bug-AGL: SPEC-1191
- Update utilities and templates
- Add audio roles as shown in 4a-hal-reference
Change-Id: I796efa0f28b0d8bfa08740e9018dfa3924eaa6a9
Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
-rw-r--r-- | MOST_UNICENS/hal_most_unicens.c | 183 | ||||
m--------- | afb-utilities | 0 | ||||
m--------- | conf.d/app-templates | 0 |
3 files changed, 182 insertions, 1 deletions
diff --git a/MOST_UNICENS/hal_most_unicens.c b/MOST_UNICENS/hal_most_unicens.c index 39cf14d..a4ce2a7 100644 --- a/MOST_UNICENS/hal_most_unicens.c +++ b/MOST_UNICENS/hal_most_unicens.c @@ -26,6 +26,106 @@ #define ALSA_DEVICE_ID "hw:1" #define PCM_MAX_CHANNELS 6 +/* Define few private tag for not standard functions */ +#define PCM_Volume_Multimedia 1000 +#define PCM_Volume_Navigation 1001 +#define PCM_Volume_Emergency 1002 + +/* Default Values for MasterVolume Ramping */ +STATIC halVolRampT volRampMaster= { + .mode = RAMP_VOL_NORMAL, + .slave = Master_Playback_Volume, + .delay = 100*1000, // ramping delay in us + .stepDown=1, + .stepUp =1, +}; + +/* Soft Volume Ramping Value can be customize by Audio Role and hardware card */ +STATIC halVolRampT volRampEmergency= { + .slave = Emergency_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 10, +}; + +STATIC halVolRampT volRampWarning= { + .slave = Warning_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 10, +}; + +STATIC halVolRampT volRampCustomHigh= { + .slave = CustomHigh_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 4, +}; + +STATIC halVolRampT volRampPhone= { + .slave = Phone_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 4, +}; + +STATIC halVolRampT volRampNavigation= { + .slave = Navigation_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 4, +}; + +STATIC halVolRampT volRampCustomMedium= { + .slave = CustomMedium_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 4, +}; + +STATIC halVolRampT volRampVideo= { + .slave = Video_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 4, +}; + +STATIC halVolRampT volRampStreaming= { + .slave = Streaming_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 4, +}; + +STATIC halVolRampT volRampMultimedia= { + .slave = Multimedia_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 4, +}; + +STATIC halVolRampT volRampRadio= { + .slave = Radio_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 4, +}; + +STATIC halVolRampT volRampCustomLow= { + .slave = CustomLow_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 4, +}; + +STATIC halVolRampT volRampFallback= { + .slave = Fallback_Playback_Volume, + .delay = 50*1000, // ramping delay in us + .stepDown= 2, + .stepUp = 4, +}; + + static int master_volume; static json_bool master_switch; static int pcm_volume[PCM_MAX_CHANNELS]; @@ -144,7 +244,88 @@ STATIC alsaHalMapT alsaHalMap[]= { { .tag=PCM_Playback_Volume, .cb={.callback=unicens_pcm_vol_cb, .handle=&pcm_volume}, .info="Sets PCM playback volume", .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=6, .minval=0, .maxval=100, .step=1, .value=100, .name="PCM Playback Volume"} }, - { .tag=EndHalCrlTag} /* marker for end of the array */ + + // Sound card does not have hardware volume ramping + { .tag=Master_Playback_Ramp , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="Master Playback Volume Ramp", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .name="Master_Ramp"} + }, + + // Implement Rampup Volume for Virtual Channels (0-100) + { .tag=Emergency_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampEmergency}, .info="RampUp Emergency Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Emergency_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + { .tag=Warning_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampWarning}, .info="RampUp Warning Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Warning_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + { .tag=CustomHigh_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampCustomHigh}, .info="RampUp CustomHigh Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="CustomHigh_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + { .tag=Phone_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampPhone}, .info="RampUp Phone Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Phone_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + { .tag=Navigation_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampNavigation}, .info="RampUp Navigation Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Navigation_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + { .tag=CustomMedium_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampCustomMedium}, .info="RampUp CustomMedium Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="CustomMedium_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + { .tag=Video_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampVideo}, .info="RampUp Video Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Video_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + { .tag=Streaming_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampStreaming}, .info="RampUp Streaming Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Streaming_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + { .tag=Multimedia_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampMultimedia}, .info="RampUp Multimedia Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Multimedia_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + { .tag=Radio_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampRadio}, .info="RampUp Radio Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Radio_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + { .tag=CustomLow_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampCustomLow}, .info="RampUp CustomLow Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="CustomLow_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + { .tag=Fallback_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampFallback}, .info="RampUp Fallback Volume", + .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Fallback_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } + }, + + // Bind with existing ones created by ALSA configuration (and linked to softvol) [0-255] + { .tag=Emergency_Playback_Volume , + .ctl={.name="Emergency_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Warning_Playback_Volume , + .ctl={.name="Warning_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=CustomHigh_Playback_Volume , + .ctl={.name="CustomHigh_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Phone_Playback_Volume , + .ctl={.name="Phone_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Navigation_Playback_Volume , + .ctl={.name="Navigation_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=CustomMedium_Playback_Volume , + .ctl={.name="CustomMedium_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Video_Playback_Volume , + .ctl={.name="Video_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Streaming_Playback_Volume , + .ctl={.name="Streaming_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Multimedia_Playback_Volume , + .ctl={.name="Multimedia_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Radio_Playback_Volume , + .ctl={.name="Radio_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=CustomLow_Playback_Volume , + .ctl={.name="CustomLow_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Fallback_Playback_Volume , + .ctl={.name="Fallback_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=EndHalCrlTag} /* marker for end of the array */ } ; /* HAL sound card mapping info */ diff --git a/afb-utilities b/afb-utilities -Subproject 88307badb86a1252b0286e29ac3c1165bbee680 +Subproject 7db4aac29d251134dea5ec4425ef87c970f6fec diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject f3954e8390b24c32a47bd543c25cdad80b59eb2 +Subproject ee5d60f9d169d959cca9dc24cfc3776ed06c163 |