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

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

Merge "Merge 90ff1782 on remote branch"

parents 000aeddf 0428e2e9

hal/audio_extn/utils.c

+3 −4
Original line number Diff line number Diff line
@@ -580,14 +580,13 @@ int audio_extn_utils_send_app_type_cfg(struct audio_usecase *usecase) 


    if ((24 == usecase->stream.out->bit_width) &&

        (usecase->stream.out->devices & AUDIO_DEVICE_OUT_SPEAKER)) {

        sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;

        out->app_type_cfg.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;

    } else if ((snd_device != SND_DEVICE_OUT_HEADPHONES_44_1 &&

        usecase->stream.out->sample_rate == OUTPUT_SAMPLING_RATE_44100) ||

        (usecase->stream.out->sample_rate < OUTPUT_SAMPLING_RATE_44100)) {

        sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;

    } else {

        sample_rate = out->app_type_cfg.sample_rate;

        out->app_type_cfg.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;

    }

    sample_rate = out->app_type_cfg.sample_rate;



    app_type_cfg[len++] = out->app_type_cfg.app_type;

    app_type_cfg[len++] = acdb_dev_id;

hal/audio_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -424,8 +424,8 @@ int enable_audio_route(struct audio_device *adev, 
    audio_extn_dolby_ds2_set_endpoint(adev);

    audio_extn_sound_trigger_update_stream_status(usecase, ST_EVENT_STREAM_BUSY);

    audio_extn_listen_update_stream_status(usecase, LISTEN_EVENT_STREAM_BUSY);

    audio_extn_utils_send_audio_calibration(adev, usecase);

    audio_extn_utils_send_app_type_cfg(usecase);

    audio_extn_utils_send_audio_calibration(adev, usecase);

    strlcpy(mixer_path, use_case_table[usecase->id], MIXER_PATH_MAX_LENGTH);

    platform_add_backend_name(mixer_path, snd_device, usecase);

    ALOGV("%s: apply mixer and update path: %s", __func__, mixer_path);