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

Commit 652965da authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[LEA] Fix not select 32k in software path" into main am: 2d26aa40 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2766906



Change-Id: Ic9ab3bd5497d7a525ea5cb89b7f318d5e3a229c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef0ce0fc 2d26aa40

system/bta/le_audio/codec_manager.cc

+1 −2
Original line number Diff line number Diff line
@@ -128,8 +128,7 @@ struct codec_manager_impl { 
  CodecLocation GetCodecLocation(void) const { return codec_location_; }



  bool IsOffloadDualBiDirSwbSupported(void) const {

    return codec_location_ == le_audio::types::CodecLocation::ADSP &&

           offload_dual_bidirection_swb_supported_;

    return offload_dual_bidirection_swb_supported_;

  }



  void UpdateActiveAudioConfig(

system/bta/le_audio/devices.cc

+3 −1
Original line number Diff line number Diff line
@@ -1426,7 +1426,9 @@ bool LeAudioDeviceGroup::IsAudioSetConfigurationSupported( 
      AudioSetConfigurationProvider::Get()->CheckConfigurationIsBiDirSwb(

          *audio_set_conf)) {

    if (!dual_bidirection_swb_supported_ ||

        !CodecManager::GetInstance()->IsOffloadDualBiDirSwbSupported()) {

        (CodecManager::GetInstance()->GetCodecLocation() ==

             types::CodecLocation::ADSP &&

         !CodecManager::GetInstance()->IsOffloadDualBiDirSwbSupported())) {

      /* two conditions

       * 1) dual bidirection swb is not supported for both software/offload

       * 2) offload not supported

system/bta/le_audio/le_audio_set_configuration_provider_json.cc

+2 −2
Original line number Diff line number Diff line
@@ -773,8 +773,8 @@ bool AudioSetConfigurationProvider::CheckConfigurationIsBiDirSwb( 


bool AudioSetConfigurationProvider::CheckConfigurationIsDualBiDirSwb(

    const set_configurations::AudioSetConfiguration& set_configuration) const {

  bool single_dev_dual_bidir_swb = false;

  bool dual_dev_dual_bidir_swb = false;

  uint8_t single_dev_dual_bidir_swb = 0;

  uint8_t dual_dev_dual_bidir_swb = 0;



  for (const auto& conf : set_configuration.confs) {

    if (conf.codec.GetConfigSamplingFrequency() <