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

Commit 603dfeb3 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 to make code more reliable" into av-userspace.lnx.2.0-dev

parents d2f6d813 30124113

hal/audio_extn/source_track.c

+22 −8
Original line number Diff line number Diff line
@@ -260,6 +260,12 @@ static int parse_soundfocus_sourcetracking_keys(struct str_parms *parms) 
    int ret = 0, err;

    char *kv_pairs = str_parms_to_str(parms);



    if(kv_pairs == NULL) {

        ret = -ENOMEM;

        ALOGE("[%s] key-value pair is NULL",__func__);

        goto done;

    }



    ALOGV_IF(kv_pairs != NULL, "%s: enter: %s", __func__, kv_pairs);



    len = strlen(kv_pairs);
@@ -321,6 +327,7 @@ static int parse_soundfocus_sourcetracking_keys(struct str_parms *parms) 
    }



done:

    if (kv_pairs)

        free(kv_pairs);

    if(value != NULL)

        free(value);
@@ -441,8 +448,8 @@ static void send_soundfocus_sourcetracking_params(struct str_parms *reply, 
            if ((i >=4) && (sound_focus_data.start_angle[i] == 0xFFFF))

                continue;

            if (i)

                snprintf(value + strlen(value), MAX_STR_SIZE, ",");

            snprintf(value + strlen(value), MAX_STR_SIZE, "%d", sound_focus_data.start_angle[i]);

                snprintf(value + strlen(value) - 1, MAX_STR_SIZE, ",");

            snprintf(value + strlen(value) - 1, MAX_STR_SIZE, "%d", sound_focus_data.start_angle[i]);

        }

        str_parms_add_str(reply, AUDIO_PARAMETER_KEY_SOUND_FOCUS_START_ANGLES, value);

    }
@@ -468,8 +475,8 @@ static void send_soundfocus_sourcetracking_params(struct str_parms *reply, 
            if ((i >=4) && (source_tracking_data.vad[i] == 0xFF))

                continue;

            if (i)

                snprintf(value + strlen(value), MAX_STR_SIZE, ",");

            snprintf(value + strlen(value), MAX_STR_SIZE, "%d", source_tracking_data.vad[i]);

                snprintf(value + strlen(value) - 1, MAX_STR_SIZE, ",");

            snprintf(value + strlen(value) - 1, MAX_STR_SIZE, "%d", source_tracking_data.vad[i]);

        }

        str_parms_add_str(reply, AUDIO_PARAMETER_KEY_SOURCE_TRACK_VAD, value);

    }
@@ -488,8 +495,8 @@ static void send_soundfocus_sourcetracking_params(struct str_parms *reply, 
    if (bitmask & BITMASK_AUDIO_PARAMETER_KEY_SOURCE_TRACK_POLAR_ACTIVITY) {

        for (i = 0; i < 360; i++) {

            if (i)

                snprintf(value + strlen(value), MAX_STR_SIZE, ",");

            snprintf(value + strlen(value), MAX_STR_SIZE, "%d", source_tracking_data.polar_activity[i]);

                snprintf(value + strlen(value) - 1, MAX_STR_SIZE, ",");

            snprintf(value + strlen(value) - 1, MAX_STR_SIZE, "%d", source_tracking_data.polar_activity[i]);

        }

        str_parms_add_str(reply, AUDIO_PARAMETER_KEY_SOURCE_TRACK_POLAR_ACTIVITY, value);

    }
@@ -527,6 +534,12 @@ void audio_extn_source_track_set_parameters(struct audio_device *adev, 
    char *value = NULL;

    char *kv_pairs = str_parms_to_str(parms);



    if(kv_pairs == NULL) {

        ret = -ENOMEM;

        ALOGE("[%s] key-value pair is NULL",__func__);

        goto done;

    }



    len = strlen(kv_pairs);

    value = (char*)calloc(len, sizeof(char));

    if(value == NULL) {
@@ -631,6 +644,7 @@ void audio_extn_source_track_set_parameters(struct audio_device *adev, 
    }



done:

    if (kv_pairs)

        free(kv_pairs);

    if(value != NULL)

        free(value);