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

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

Merge "audio: aptX: don't set bit-width explicitly"

parents 6dd91db4 7d283a70

hal/audio_extn/a2dp.c

+1 −6
Original line number Diff line number Diff line
@@ -794,13 +794,8 @@ bool audio_extn_a2dp_is_force_device_switch() 
    return a2dp.is_handoff_in_progress || !a2dp.a2dp_started;

}



void audio_extn_a2dp_get_apptype_params(uint32_t *sample_rate,

                                        uint32_t *bit_width)

void audio_extn_a2dp_get_sample_rate(int *sample_rate)

{

    if(a2dp.bt_encoder_format == AUDIO_FORMAT_APTX_HD)

        *bit_width = 24;

    else

        *bit_width = 16;

    *sample_rate = a2dp.enc_sampling_rate;

}

hal/audio_extn/audio_extn.h

+2 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ bool audio_extn_usb_is_capture_supported(); 
#define audio_extn_a2dp_set_parameters(parms)            (0)

#define audio_extn_a2dp_is_force_device_switch()         (0)

#define audio_extn_a2dp_set_handoff_mode(is_on)          (0)

#define audio_extn_a2dp_get_apptype_params(sample_rate,bit_width)    (0)

#define audio_extn_a2dp_get_sample_rate(sample_rate)     (0)

#define audio_extn_a2dp_get_encoder_latency()            (0)

#define audio_extn_a2dp_is_ready()                       (0)

#else
@@ -214,8 +214,7 @@ void audio_extn_a2dp_stop_playback(); 
void audio_extn_a2dp_set_parameters(struct str_parms *parms);

bool audio_extn_a2dp_is_force_device_switch();

void audio_extn_a2dp_set_handoff_mode(bool is_on);

void audio_extn_a2dp_get_apptype_params(uint32_t *sample_rate,

                                        uint32_t *bit_width);

void audio_extn_a2dp_get_sample_rate(int *sample_rate);

uint32_t audio_extn_a2dp_get_encoder_latency();

bool audio_extn_a2dp_is_ready();

#endif

hal/audio_extn/utils.c

+8 −6
Original line number Diff line number Diff line
@@ -670,12 +670,6 @@ void audio_extn_utils_update_stream_output_app_type_cfg(void *platform, 
            sample_rate = OUTPUT_SAMPLING_RATE_DSD128;

    }



    if(devices & AUDIO_DEVICE_OUT_ALL_A2DP) {

        //TODO: Handle fractional sampling rate configuration for LL

        audio_extn_a2dp_get_apptype_params(&sample_rate, &bit_width);

        ALOGI("%s using %d sampling rate %d bit width for A2DP CoPP",

              __func__, sample_rate, bit_width);

    }



    ALOGV("%s: flags: %x, format: %x sample_rate %d, profile %s, app_type %d",

           __func__, flags, format, sample_rate, profile, app_type_cfg->app_type);
@@ -875,6 +869,14 @@ static int send_app_type_cfg_for_device(struct audio_device *adev, 
            (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->stream.out->devices & AUDIO_DEVICE_OUT_ALL_A2DP) {

                 /*

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

                  * for bit width use the stream param only.

                  */

                   audio_extn_a2dp_get_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);

        }

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