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

Commit 8c4893f5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "LeAudio: Fix configuring incomplete group" into main am: bbc6e458 

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



Change-Id: Ie5afcbb9997979c8928e919da9e91736552d8fc1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e0f55557 bbc6e458

system/bta/le_audio/devices.cc

+30 −8
Original line number Diff line number Diff line
@@ -261,7 +261,31 @@ bool LeAudioDevice::ConfigureAses( 
    return false;

  }



  auto const& ase_configs = audio_set_conf->confs.get(direction);

  auto audio_locations = (direction == types::kLeAudioDirectionSink)

                             ? snk_audio_locations_

                             : src_audio_locations_;



  auto const& group_ase_configs = audio_set_conf->confs.get(direction);

  std::vector<set_configurations::AseConfiguration> ase_configs;

  std::copy_if(group_ase_configs.cbegin(), group_ase_configs.cend(),

               std::back_inserter(ase_configs),

               [&audio_locations](auto const& cfg) {

                 /* Pass as matching if config has no allocation to match

                  * (the legacy json config provider). Otherwise, with the codec

                  * extensibility feature enabled, we receive ASE configurations

                  * for the whole group and we should filter them by audio

                  * allocations to match with the locations supported by a

                  * particular device.

                  */

                 auto config = cfg.codec.params.GetAsCoreCodecConfig();

                 if (!config.audio_channel_allocation.has_value()) return true;



                 // Filter-out not matching audio locations

                 return (cfg.codec.params.GetAsCoreCodecConfig()

                             .audio_channel_allocation.value() &

                         audio_locations.to_ulong()) != 0;

               });



  auto const& pacs =

      (direction == types::kLeAudioDirectionSink) ? snk_pacs_ : src_pacs_;

  for (size_t i = 0; i < ase_configs.size() && ase; ++i) {
@@ -280,16 +304,13 @@ bool LeAudioDevice::ConfigureAses( 
   */

  uint8_t active_ases = *number_of_already_active_group_ase;



  auto audio_locations = (direction == types::kLeAudioDirectionSink)

                             ? snk_audio_locations_

                             : src_audio_locations_;



  // Before we activate the ASEs, make sure we have the right configuration

  // Check for matching PACs only if we know that the LTV format is being used.

  uint8_t max_required_ase_per_dev = ase_configs.size() / num_of_devices +

                                     (ase_configs.size() % num_of_devices);

  int needed_ase = std::min((int)(max_required_ase_per_dev),

                            (int)(ase_configs.size() - active_ases));

  int needed_ase =

      std::min((int)(max_required_ase_per_dev), (int)(ase_configs.size()));



  for (int i = 0; i < needed_ase; ++i) {

    auto const& ase_cfg = ase_configs.at(i);

    if (utils::IsCodecUsingLtvFormat(ase_cfg.codec.id) &&
@@ -299,7 +320,8 @@ bool LeAudioDevice::ConfigureAses( 
    }

  }



  auto strategy = utils::GetStrategyForAseConfig(ase_configs, num_of_devices);

  auto strategy =

      utils::GetStrategyForAseConfig(group_ase_configs, num_of_devices);



  // Make sure we configure a single microphone if Dual Bidir SWB is not

  // supported.

system/bta/le_audio/devices_test.cc

+32 −4
Original line number Diff line number Diff line
@@ -2100,10 +2100,6 @@ TEST_P(LeAudioAseConfigurationTest, test_unsupported_codec) { 
}



TEST_P(LeAudioAseConfigurationTest, test_reconnection_media) {

  // Skip this test as it uses LC3 codec configuration provider for PACs

  // creation, which is not going to work with the Vendor Codec Provider.

  if (codec_coding_format_ != kLeAudioCodingFormatLC3) GTEST_SKIP();



  LeAudioDevice* left = AddTestDevice(2, 1);

  LeAudioDevice* right = AddTestDevice(2, 1);
@@ -2451,6 +2447,38 @@ TEST_P(LeAudioAseConfigurationTest, test_config_support) { 
  ASSERT_TRUE(right->IsAudioSetConfigurationSupported(test_config));

}



TEST_P(LeAudioAseConfigurationTest,

       test_vendor_codec_configure_incomplete_group) {

  // A group of two earbuds

  LeAudioDevice* left = AddTestDevice(2, 1);

  LeAudioDevice* right = AddTestDevice(2, 1);



  /* Change location as by default it is stereo */

  left->snk_audio_locations_ =

      ::bluetooth::le_audio::codec_spec_conf::kLeAudioLocationFrontLeft;

  left->src_audio_locations_ =

      ::bluetooth::le_audio::codec_spec_conf::kLeAudioLocationFrontLeft;

  right->snk_audio_locations_ =

      ::bluetooth::le_audio::codec_spec_conf::kLeAudioLocationFrontRight;

  right->src_audio_locations_ =

      ::bluetooth::le_audio::codec_spec_conf::kLeAudioLocationFrontRight;

  group_->ReloadAudioLocations();



  // The Right earbud is currently disconnected

  right->SetConnectionState(DeviceConnectState::DISCONNECTED);



  uint8_t direction_to_verify = kLeAudioDirectionSink;

  uint8_t devices_to_verify = 1;

  TestGroupAseConfigurationData data[] = {

      {left, kLeAudioCodecChannelCountSingleChannel,

       kLeAudioCodecChannelCountSingleChannel, 1, 0},

      {right, kLeAudioCodecChannelCountSingleChannel,

       kLeAudioCodecChannelCountSingleChannel, 0, 0}};



  TestGroupAseConfiguration(LeAudioContextType::MEDIA, data, devices_to_verify,

                            direction_to_verify);

}



INSTANTIATE_TEST_CASE_P(Test, LeAudioAseConfigurationTest,

                        ::testing::Values(kLeAudioCodingFormatLC3,

                                          kLeAudioCodingFormatVendorSpecific));