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

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

Merge "hal: Use default backend sample rate during device switch"

parents ebc5c701 0a99fcf6

hal/msm8916/platform.c

+5 −5
Original line number Diff line number Diff line
@@ -6218,12 +6218,12 @@ static bool platform_check_codec_backend_cfg(struct audio_device* adev, 
    }



    /*

     * Check if the device is speaker or handset,assumption handset shares

     * backend with speaker, and these devices are restricited to 48kHz.

     * Handset and speaker may have diffrent backend. Check if the device is speaker or handset,

     * and these devices are restricited to 48kHz.

     */

    if (platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, snd_device) &&

        !(codec_device_supports_native_playback(usecase->devices) &&

          my_data->hifi_audio && !check_hdset_combo_device(snd_device))) {

    if ((platform_get_backend_index(snd_device) == DEFAULT_CODEC_BACKEND) &&

        (platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, snd_device) ||

         platform_check_backends_match(SND_DEVICE_OUT_HANDSET, snd_device))) {

        sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;



        if (bit_width >= 24) {

hal/msm8974/platform.c

+5 −4
Original line number Diff line number Diff line
@@ -6147,11 +6147,12 @@ static bool platform_check_codec_backend_cfg(struct audio_device* adev, 
    }



    /*

     * Check if the device is speaker or handset,assumption handset shares

     * backend with speaker, and these devices are restricited to 48kHz.

     * Handset and speaker may have diffrent backend. Check if the device is speaker or handset,

     * and these devices are restricited to 48kHz.

     */

    if (platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, snd_device)) {



    if ((platform_get_backend_index(snd_device) == DEFAULT_CODEC_BACKEND) &&

        (platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, snd_device) ||

         platform_check_backends_match(SND_DEVICE_OUT_HANDSET, snd_device))) {

        if (bit_width >= 24) {

            bit_width = platform_get_snd_device_bit_width(SND_DEVICE_OUT_SPEAKER);

            ALOGD("%s:becf: afe: reset bitwidth to %d (based on supported"