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

Commit d4640f3f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: update csd soft volume and mute controls"

parents 6b4a1bc9 c37f42a4

hal/msm8974/platform.c

+5 −3
Original line number Diff line number Diff line
@@ -1076,7 +1076,8 @@ int platform_set_voice_volume(void *platform, int volume) 
    mixer_ctl_set_array(ctl, set_values, ARRAY_SIZE(set_values));



    if (my_data->csd != NULL) {

        ret = my_data->csd->volume(ALL_SESSION_VSID, volume);

        ret = my_data->csd->volume(ALL_SESSION_VSID, volume,

                                   DEFAULT_VOLUME_RAMP_DURATION_MS);

        if (ret < 0) {

            ALOGE("%s: csd_volume error %d", __func__, ret);

        }
@@ -1093,7 +1094,7 @@ int platform_set_mic_mute(void *platform, bool state) 
    int ret = 0;

    uint32_t set_values[ ] = {0,

                              ALL_SESSION_VSID,

                              DEFAULT_VOLUME_RAMP_DURATION_MS};

                              DEFAULT_MUTE_RAMP_DURATION_MS};



    set_values[0] = state;

    ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);
@@ -1106,7 +1107,8 @@ int platform_set_mic_mute(void *platform, bool state) 
    mixer_ctl_set_array(ctl, set_values, ARRAY_SIZE(set_values));



    if (my_data->csd != NULL) {

        ret = my_data->csd->mic_mute(ALL_SESSION_VSID, state);

        ret = my_data->csd->mic_mute(ALL_SESSION_VSID, state,

                                     DEFAULT_MUTE_RAMP_DURATION_MS);

        if (ret < 0) {

            ALOGE("%s: csd_mic_mute error %d", __func__, ret);

        }

hal/msm8974/platform.h

+3 −3
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ enum { 
#define DEFAULT_OUTPUT_SAMPLING_RATE 48000



#define ALL_SESSION_VSID                0xFFFFFFFF

#define DEFAULT_MUTE_RAMP_DURATION      500

#define DEFAULT_MUTE_RAMP_DURATION_MS   20

#define DEFAULT_VOLUME_RAMP_DURATION_MS 20

#define MIXER_PATH_MAX_LENGTH 100
@@ -250,8 +250,8 @@ typedef int (*deinit_t)(); 
typedef int (*disable_device_t)();

typedef int (*enable_device_config_t)(int, int);

typedef int (*enable_device_t)(int, int, uint32_t);

typedef int (*volume_t)(uint32_t, int);

typedef int (*mic_mute_t)(uint32_t, int);

typedef int (*volume_t)(uint32_t, int, uint16_t);

typedef int (*mic_mute_t)(uint32_t, int, uint16_t);

typedef int (*slow_talk_t)(uint32_t, uint8_t);

typedef int (*start_voice_t)(uint32_t);

typedef int (*stop_voice_t)(uint32_t);