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

Commit e12dfa1b authored by Lakshman Chaluvaraju's avatar Lakshman Chaluvaraju
Browse files

hal: sampling rate mismatch during a2dp+spk combo usecase. 

During a2dp+spk combo usecase, a2dp device is assigned with
sampling rate of speaker though requested sampling rate of
a2dp was different.

Fix this by moving assignment of speaker sampling rate after
the condition of a2dp+spk combo was validated.

Change-Id: Iae02657bea51807191d864964865465e558b919d
parent 5e44b789

hal/audio_extn/utils.c

+5 −7
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2014 The Android Open Source Project
@@ -1159,9 +1159,6 @@ int audio_extn_utils_get_app_sample_rate_for_device( 


        if (usecase->id == USECASE_AUDIO_PLAYBACK_VOIP) {

            usecase->stream.out->app_type_cfg.sample_rate = usecase->stream.out->sample_rate;

        } else if (compare_device_type(&usecase->stream.out->device_list,

                                       AUDIO_DEVICE_OUT_SPEAKER)) {

            usecase->stream.out->app_type_cfg.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;

        } else if ((snd_device == SND_DEVICE_OUT_HDMI ||

                    snd_device == SND_DEVICE_OUT_USB_HEADSET ||

                    snd_device == SND_DEVICE_OUT_DISPLAY_PORT) &&
@@ -1180,9 +1177,7 @@ int audio_extn_utils_get_app_sample_rate_for_device( 
            (usecase->stream.out->sample_rate < OUTPUT_SAMPLING_RATE_44100)) {

            /* Reset to default if no native stream is active*/

            usecase->stream.out->app_type_cfg.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;

        } else if (usecase->out_snd_device == SND_DEVICE_OUT_BT_A2DP ||

                   usecase->out_snd_device == SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP ||

                   usecase->out_snd_device == SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP) {

        } else if (snd_device == SND_DEVICE_OUT_BT_A2DP) {

                 /*

                  * For a2dp playback get encoder sampling rate and set copp sampling rate,

                  * for bit width use the stream param only.
@@ -1190,6 +1185,9 @@ int audio_extn_utils_get_app_sample_rate_for_device( 
                   audio_extn_a2dp_get_enc_sample_rate(&usecase->stream.out->app_type_cfg.sample_rate);

                   ALOGI("%s using %d sample rate rate for A2DP CoPP",

                        __func__, usecase->stream.out->app_type_cfg.sample_rate);

        } else if (compare_device_type(&usecase->stream.out->device_list,

                                       AUDIO_DEVICE_OUT_SPEAKER)) {

            usecase->stream.out->app_type_cfg.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;

        }

        audio_extn_btsco_get_sample_rate(snd_device, &usecase->stream.out->app_type_cfg.sample_rate);

        sample_rate = usecase->stream.out->app_type_cfg.sample_rate;