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

Commit 3c1dd2d9 authored by Grzegorz Kołodziejczyk's avatar Grzegorz Kołodziejczyk Committed by Automerger Merge Worker
Browse files

le_audio: Implement group direction handling am: 847dcfad am: 83706e8a am:... 

le_audio: Implement group direction handling am: 847dcfad am: 83706e8a am: d5ce6795 am: 99d2dca8

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



Change-Id: I06a5d1bc4b0604ec8d00ac6eac99ed5e37297bb1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bdd49250 99d2dca8

system/bta/le_audio/client.cc

+22 −4
Original line number Diff line number Diff line
@@ -512,7 +512,11 @@ class LeAudioClientImpl : public LeAudioClient { 
      std::optional<AudioContexts> old_group_updated_contexts =

          old_group->UpdateActiveContextsMap(old_group->GetActiveContexts());



      if (old_group_updated_contexts || old_group->ReloadAudioLocations()) {

      bool group_conf_changed = old_group->ReloadAudioLocations();

      group_conf_changed |= old_group->ReloadAudioDirections();

      group_conf_changed |= old_group_updated_contexts.has_value();



      if (group_conf_changed) {

        callbacks_->OnAudioConf(old_group->audio_directions_, old_group_id,

                                old_group->snk_audio_locations_.to_ulong(),

                                old_group->src_audio_locations_.to_ulong(),
@@ -575,7 +579,11 @@ class LeAudioClientImpl : public LeAudioClient { 
    std::optional<AudioContexts> updated_contexts =

        group->UpdateActiveContextsMap(group->GetActiveContexts());



    if (updated_contexts || group->ReloadAudioLocations())

    bool group_conf_changed = group->ReloadAudioLocations();

    group_conf_changed |= group->ReloadAudioDirections();

    group_conf_changed |= updated_contexts.has_value();



    if (group_conf_changed)

      callbacks_->OnAudioConf(group->audio_directions_, group->group_id_,

                              group->snk_audio_locations_.to_ulong(),

                              group->src_audio_locations_.to_ulong(),
@@ -1182,7 +1190,12 @@ class LeAudioClientImpl : public LeAudioClient { 
      /* Read of source audio locations during initial attribute discovery.

       * Group would be assigned once service search is completed.

       */

      if (group && group->ReloadAudioLocations()) {

      if (!group) return;



      bool group_conf_changed = group->ReloadAudioLocations();

      group_conf_changed |= group->ReloadAudioDirections();



      if (group_conf_changed) {

        callbacks_->OnAudioConf(group->audio_directions_, group->group_id_,

                                group->snk_audio_locations_.to_ulong(),

                                group->src_audio_locations_.to_ulong(),
@@ -1211,7 +1224,12 @@ class LeAudioClientImpl : public LeAudioClient { 
      /* Read of source audio locations during initial attribute discovery.

       * Group would be assigned once service search is completed.

       */

      if (group && group->ReloadAudioLocations()) {

      if (!group) return;



      bool group_conf_changed = group->ReloadAudioLocations();

      group_conf_changed |= group->ReloadAudioDirections();



      if (group_conf_changed) {

        callbacks_->OnAudioConf(group->audio_directions_, group->group_id_,

                                group->snk_audio_locations_.to_ulong(),

                                group->src_audio_locations_.to_ulong(),

system/bta/le_audio/devices.cc

+16 −0
Original line number Diff line number Diff line
@@ -697,6 +697,22 @@ bool LeAudioDeviceGroup::ReloadAudioLocations(void) { 
  return true;

}



bool LeAudioDeviceGroup::ReloadAudioDirections(void) {

  uint8_t updated_audio_directions = 0x00;



  for (const auto& device : leAudioDevices_) {

    if (device.expired()) continue;

    updated_audio_directions |= device.lock().get()->audio_directions_;

  }



  /* Nothing has changed */

  if (updated_audio_directions == audio_directions_) return false;



  audio_directions_ = updated_audio_directions;



  return true;

}



bool LeAudioDeviceGroup::IsInTransition(void) {

  return target_state_ != current_state_;

}

system/bta/le_audio/devices.h

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ class LeAudioDeviceGroup { 
      types::AudioContexts contexts);

  std::optional<types::AudioContexts> UpdateActiveContextsMap(void);

  bool ReloadAudioLocations(void);

  bool ReloadAudioDirections(void);

  const set_configurations::AudioSetConfiguration* GetActiveConfiguration(void);

  types::LeAudioContextType GetCurrentContextType(void);

  bool IsPendingConfiguration(void);