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

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

Merge "audio: add audio source tracking feature flag."

parents 65f4e922 68bb881d

configs/msm8909/msm8909.mk

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ USE_CUSTOM_AUDIO_POLICY := 1 
BOARD_USES_ALSA_AUDIO := true

BOARD_SUPPORTS_SOUND_TRIGGER := true



AUDIO_FEATURE_ENABLED_SOURCE_TRACKING:= true

#AUDIO_FEATURE_ENABLED_ANC_HEADSET := true

#AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := true

ifneq ($(TARGET_SUPPORTS_WEARABLES),true)

hal/audio_extn/audio_extn.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ void audio_extn_hfp_set_parameters(struct audio_device *adev, 
#else

void audio_extn_source_track_set_parameters(struct audio_device *adev,

                                            struct str_parms *parms);

void audio_extn_source_track_get_parameters(struct audio_device *adev,

void audio_extn_source_track_get_parameters(const struct audio_device *adev,

                                            struct str_parms *query,

                                            struct str_parms *reply);

#endif

hal/audio_extn/source_track.c

+5 −6
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ 
#define MAX_SECTORS                                         8

#define MAX_STR_SIZE                                       2048



struct audio_device_to_audio_interface audio_device_to_interface_table[];

int audio_device_to_interface_table_len;

extern struct audio_device_to_audio_interface audio_device_to_interface_table[];

extern int audio_device_to_interface_table_len;



struct sound_focus_param {

    uint16_t start_angle[MAX_SECTORS];
@@ -255,9 +255,8 @@ done: 


static int parse_soundfocus_sourcetracking_keys(struct str_parms *parms)

{

    char *str;

    char *value = NULL;

    int val, len;

    int len;

    int ret = 0, err;

    char *kv_pairs = str_parms_to_str(parms);
@@ -339,7 +338,7 @@ static int get_soundfocus_sourcetracking_data(struct audio_device *adev, 
    char sound_focus_mixer_ctl_name[MIXER_PATH_MAX_LENGTH] = "Sound Focus";

    char source_tracking_mixer_ctl_name[MIXER_PATH_MAX_LENGTH] = "Source Tracking";

    int ret = -EINVAL;

    int i, count;

    int count;



    if (bitmask & BITMASK_AUDIO_PARAMETER_KEYS_SOUND_FOCUS) {

        /* Derive the mixer control name based on the use case and the audio interface
@@ -434,7 +433,7 @@ static void send_soundfocus_sourcetracking_params(struct str_parms *reply, 
                                                const struct sound_focus_param sound_focus_data,

                                                const struct source_tracking_param source_tracking_data)

{

    int i = 0, len = 0;

    int i = 0;

    char value[MAX_STR_SIZE] = "";



    if (bitmask & BITMASK_AUDIO_PARAMETER_KEY_SOUND_FOCUS_START_ANGLES) {