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

Commit 7792e17e authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Gerrit Code Review
Browse files

Merge changes I1b09f805,I82861bd9,Id51c1821,Ib3a3f68a 

* changes:
  LeAudio: Add timeout to VBC close
  LeAudio: Support for Live recordings
  LeAudio: Improve function naming
  LeAudio: Fix crash on bad remote audio allocation config
parents 13b27be3 7a3e85c7

system/bta/le_audio/client.cc

+407 −154

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/le_audio/devices.cc

+37 −40
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ bool LeAudioDeviceGroup::IsInTransition(void) { 
  return target_state_ != current_state_;

}



bool LeAudioDeviceGroup::IsReleasing(void) {

bool LeAudioDeviceGroup::IsReleasingOrIdle(void) {

  return target_state_ == AseState::BTA_LE_AUDIO_ASE_STATE_IDLE;

}
@@ -1333,7 +1333,7 @@ bool LeAudioDeviceGroup::IsConfigurationSupported( 
  return true;

}



uint32_t GetFirstLeft(const types::AudioLocations audio_locations) {

static uint32_t GetFirstLeft(const types::AudioLocations& audio_locations) {

  uint32_t audio_location_ulong = audio_locations.to_ulong();



  if (audio_location_ulong & codec_spec_conf::kLeAudioLocationFrontLeft)
@@ -1366,11 +1366,11 @@ uint32_t GetFirstLeft(const types::AudioLocations audio_locations) { 
  if (audio_location_ulong & codec_spec_conf::kLeAudioLocationLeftSurround)

    return codec_spec_conf::kLeAudioLocationLeftSurround;



  LOG_ASSERT(0) << __func__ << " shall not happen";

  LOG_WARN("Can't find device able to render left audio channel");

  return 0;

}



uint32_t GetFirstRight(const types::AudioLocations audio_locations) {

static uint32_t GetFirstRight(const types::AudioLocations& audio_locations) {

  uint32_t audio_location_ulong = audio_locations.to_ulong();



  if (audio_location_ulong & codec_spec_conf::kLeAudioLocationFrontRight)
@@ -1404,47 +1404,41 @@ uint32_t GetFirstRight(const types::AudioLocations audio_locations) { 
  if (audio_location_ulong & codec_spec_conf::kLeAudioLocationRightSurround)

    return codec_spec_conf::kLeAudioLocationRightSurround;



  LOG_ASSERT(0) << __func__ << " shall not happen";

  LOG_WARN("Can't find device able to render right audio channel");

  return 0;

}



uint32_t PickAudioLocation(types::LeAudioConfigurationStrategy strategy,

                           types::AudioLocations audio_locations,

                           types::AudioLocations* group_audio_locations) {

  DLOG(INFO) << __func__ << " strategy: " << (int)strategy

             << " locations: " << +audio_locations.to_ulong()

             << " group locations: " << +group_audio_locations->to_ulong();

                           types::AudioLocations device_locations,

                           types::AudioLocations* group_locations) {

  LOG_DEBUG("strategy: %d, locations: %lx, group locations: %lx", (int)strategy,

            device_locations.to_ulong(), group_locations->to_ulong());



  auto is_left_not_yet_assigned =

      !(group_locations->to_ulong() & codec_spec_conf::kLeAudioLocationAnyLeft);

  auto is_right_not_yet_assigned = !(group_locations->to_ulong() &

                                     codec_spec_conf::kLeAudioLocationAnyRight);

  uint32_t left_device_loc = GetFirstLeft(device_locations);

  uint32_t right_device_loc = GetFirstRight(device_locations);



  switch (strategy) {

    case types::LeAudioConfigurationStrategy::MONO_ONE_CIS_PER_DEVICE:

    case types::LeAudioConfigurationStrategy::STEREO_TWO_CISES_PER_DEVICE:

      if ((audio_locations.to_ulong() &

           codec_spec_conf::kLeAudioLocationAnyLeft) &&

          !(group_audio_locations->to_ulong() &

            codec_spec_conf::kLeAudioLocationAnyLeft)) {

        uint32_t left_location = GetFirstLeft(audio_locations);

        *group_audio_locations |= left_location;

        return left_location;

      if (left_device_loc && is_left_not_yet_assigned) {

        *group_locations |= left_device_loc;

        return left_device_loc;

      }



      if ((audio_locations.to_ulong() &

           codec_spec_conf::kLeAudioLocationAnyRight) &&

          !(group_audio_locations->to_ulong() &

            codec_spec_conf::kLeAudioLocationAnyRight)) {

        uint32_t right_location = GetFirstRight(audio_locations);

        *group_audio_locations |= right_location;

        return right_location;

      if (right_device_loc && is_right_not_yet_assigned) {

        *group_locations |= right_device_loc;

        return right_device_loc;

      }

      break;



    case types::LeAudioConfigurationStrategy::STEREO_ONE_CIS_PER_DEVICE:

      if ((audio_locations.to_ulong() &

           codec_spec_conf::kLeAudioLocationAnyLeft) &&

          (audio_locations.to_ulong() &

           codec_spec_conf::kLeAudioLocationAnyRight)) {

        uint32_t left_location = GetFirstLeft(audio_locations);

        uint32_t right_location = GetFirstRight(audio_locations);

        *group_audio_locations |= left_location | right_location;

        return left_location | right_location;

      if (left_device_loc && right_device_loc) {

        *group_locations |= left_device_loc | right_device_loc;

        return left_device_loc | right_device_loc;

      }

      break;

    default:
@@ -1452,12 +1446,15 @@ uint32_t PickAudioLocation(types::LeAudioConfigurationStrategy strategy, 
      return 0;

  }



  LOG_ALWAYS_FATAL(

      "%s: Shall never exit switch statement, strategy: %hhu, "

      "locations: %lx, group_locations: %lx",

      __func__, strategy, audio_locations.to_ulong(),

      group_audio_locations->to_ulong());

  return 0;

  LOG_ERROR(

      "Can't find device for left/right channel. Strategy: %hhu, "

      "device_locations: %lx, group_locations: %lx.",

      strategy, device_locations.to_ulong(), group_locations->to_ulong());



  /* Return either any left or any right audio location. It might result with

   * multiple devices within the group having the same location.

   */

  return left_device_loc ? left_device_loc : right_device_loc;

}



bool LeAudioDevice::ConfigureAses(
@@ -1632,9 +1629,9 @@ LeAudioDeviceGroup::GetActiveConfiguration(void) { 


std::optional<LeAudioCodecConfiguration>

LeAudioDeviceGroup::GetCodecConfigurationByDirection(

    types::LeAudioContextType group_context_type, uint8_t direction) {

    types::LeAudioContextType group_context_type, uint8_t direction) const {

  const set_configurations::AudioSetConfiguration* audio_set_conf =

      available_context_to_configuration_map[group_context_type];

      available_context_to_configuration_map.at(group_context_type);

  LeAudioCodecConfiguration group_config = {0, 0, 0, 0};

  if (!audio_set_conf) return std::nullopt;

system/bta/le_audio/devices.h

+2 −2
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ class LeAudioDeviceGroup { 
      LeAudioDevice* leAudioDevice,

      const set_configurations::AudioSetConfiguration* audio_set_conf);

  std::optional<LeAudioCodecConfiguration> GetCodecConfigurationByDirection(

      types::LeAudioContextType group_context_type, uint8_t direction);

      types::LeAudioContextType group_context_type, uint8_t direction) const;

  bool IsContextSupported(types::LeAudioContextType group_context_type);

  bool IsMetadataChanged(types::AudioContexts group_context_type,

                         const std::vector<uint8_t>& ccid_list);
@@ -362,7 +362,7 @@ class LeAudioDeviceGroup { 
  }



  bool IsInTransition(void);

  bool IsReleasing(void);

  bool IsReleasingOrIdle(void);

  void Dump(int fd, int active_group_id);



 private:

system/bta/le_audio/le_audio_client_test.cc

+11 −8
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ constexpr int max_num_of_ases = 5; 


static constexpr char kNotifyUpperLayerAboutGroupBeingInIdleDuringCall[] =

    "persist.bluetooth.leaudio.notify.idle.during.call";

const char* test_flags[] = {

    "INIT_logging_debug_enabled_for_all=true",

    nullptr,

};



void osi_property_set_bool(const char* key, bool value);
@@ -292,6 +296,8 @@ class MockLeAudioSourceHalClient : public LeAudioSourceAudioHalClient { 
class UnicastTestNoInit : public Test {

 protected:

  void SetUpMockAudioHal() {

    bluetooth::common::InitFlags::Load(test_flags);



    /* Since these are returned by the Acquire() methods as unique_ptrs, we

     * will not free them manually.

     */
@@ -3698,28 +3704,26 @@ TEST_F(UnicastTest, MicrophoneAttachToCurrentMediaScenario) { 
  ConnectLeAudio(test_address0);

  ASSERT_NE(group_id, bluetooth::groups::kGroupUnknown);



  // Start streaming

  uint8_t cis_count_out = 1;

  uint8_t cis_count_in = 0;



  // Audio sessions are started only when device gets active

  EXPECT_CALL(*mock_le_audio_source_hal_client_, Start(_, _)).Times(1);

  EXPECT_CALL(*mock_le_audio_sink_hal_client_, Start(_, _)).Times(1);

  LeAudioClient::Get()->GroupSetActive(group_id);



  StartStreaming(AUDIO_USAGE_MEDIA, AUDIO_CONTENT_TYPE_MUSIC, group_id,

                 AUDIO_SOURCE_MIC);



  EXPECT_CALL(

      mock_state_machine_,

      StartStream(_, le_audio::types::LeAudioContextType::VOICEASSISTANTS, _,

                  _))

      .Times(1);



  StartStreaming(AUDIO_USAGE_MEDIA, AUDIO_CONTENT_TYPE_MUSIC, group_id,

                 AUDIO_SOURCE_MIC);

  Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);

  Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);

  SyncOnMainLoop();



  // Verify Data transfer on one audio source cis

  uint8_t cis_count_out = 1;

  uint8_t cis_count_in = 0;

  TestAudioDataTransfer(group_id, cis_count_out, cis_count_in, 1920);



  // Suspend
@@ -3727,7 +3731,6 @@ TEST_F(UnicastTest, MicrophoneAttachToCurrentMediaScenario) { 
  LeAudioClient::Get()->GroupSuspend(group_id);

  Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);

  Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);

  // Mock::VerifyAndClearExpectations(&mock_audio_hal_client_);



  // Resume

  StartStreaming(AUDIO_USAGE_MEDIA, AUDIO_CONTENT_TYPE_MUSIC, group_id,

system/bta/le_audio/le_audio_set_configuration_provider_json.cc

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ struct AudioSetConfigurationProviderJson { 
      case types::LeAudioContextType::GAME:

        return "Game";

      case types::LeAudioContextType::VOICEASSISTANTS:

        return "VoiceAssinstants";

        return "VoiceAssistants";

      default:

        return kDefaultScenario;

    }