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

Commit 4f3c7a98 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Gerrit Code Review
Browse files

Merge changes Id755e424,I8d1c8a89,Ib35accf3,I4bebe861,I83d0f40f into main 

* changes:
  LeAudio: Add LIVE config. for one mic banded headphones
  LeAudio: Fix updating current scenario context
  LeAudio: Align context mixing policy
  LeAudio: Fix checking for valid configs
  LeAudio: Minor configuration update cleanup and unit test
parents 8c2a38c6 dd94b3fb

system/bta/le_audio/audio_set_scenarios.json

+6 −0
Original line number Diff line number Diff line
@@ -280,6 +280,12 @@ 
                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "SingleDev_TwoChanStereoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_32_2_Low_Latency",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_32_2_1",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1_Low_Latency",

                "SingleDev_OneChanStereoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_Low_Latency",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_2_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_Low_Latency",

system/bta/le_audio/client.cc

+134 −135

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/le_audio/devices.cc

+18 −15

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/le_audio/devices.h

+17 −6
Original line number Diff line number Diff line
@@ -357,8 +357,9 @@ class LeAudioDeviceGroup { 
  uint8_t GetTargetPhy(uint8_t direction);

  bool GetPresentationDelay(uint32_t* delay, uint8_t direction);

  uint16_t GetRemoteDelay(uint8_t direction);

  bool UpdateAudioContextTypeAvailability(types::AudioContexts contexts);

  void UpdateAudioContextTypeAvailability(void);

  bool UpdateAudioSetConfigurationCache(

      types::AudioContexts updated_context_bits);

  bool UpdateAudioSetConfigurationCache(void);

  bool ReloadAudioLocations(void);

  bool ReloadAudioDirections(void);

  const set_configurations::AudioSetConfiguration* GetActiveConfiguration(void);
@@ -369,12 +370,13 @@ class LeAudioDeviceGroup { 
  void Disable(int gatt_if);

  void Enable(int gatt_if, tBTM_BLE_CONN_TYPE reconnection_mode);

  bool IsEnabled(void);

  bool IsConfigurationSupported(

  bool IsAudioSetConfigurationSupported(

      LeAudioDevice* leAudioDevice,

      const set_configurations::AudioSetConfiguration* audio_set_conf);

  std::optional<LeAudioCodecConfiguration> GetCodecConfigurationByDirection(

      types::LeAudioContextType group_context_type, uint8_t direction) const;

  bool IsContextSupported(types::LeAudioContextType group_context_type);

  bool IsAudioSetConfigurationAvailable(

      types::LeAudioContextType group_context_type) const;

  bool IsMetadataChanged(

      const types::BidirectionalPair<types::AudioContexts>& context_types,

      const types::BidirectionalPair<std::vector<uint8_t>>& ccid_lists);
@@ -422,6 +424,11 @@ class LeAudioDeviceGroup { 
    pending_group_available_contexts_change_.clear();

  }



  inline void SetConfigurationContextType(

      types::LeAudioContextType context_type) {

    configuration_context_type_ = context_type;

  }



  inline types::LeAudioContextType GetConfigurationContextType(void) const {

    return configuration_context_type_;

  }
@@ -431,7 +438,11 @@ class LeAudioDeviceGroup { 
    return metadata_context_type_;

  }



  inline types::AudioContexts GetAvailableContexts(void) {

  inline void SetAvailableContexts(types::AudioContexts new_contexts) {

    group_available_contexts_ = new_contexts;

  }



  inline types::AudioContexts GetAvailableContexts(void) const {

    return group_available_contexts_;

  }
@@ -454,7 +465,7 @@ class LeAudioDeviceGroup { 
      const types::BidirectionalPair<types::AudioContexts>&

          metadata_context_types,

      const types::BidirectionalPair<std::vector<uint8_t>>& ccid_lists);

  bool IsConfigurationSupported(

  bool IsAudioSetConfigurationSupported(

      const set_configurations::AudioSetConfiguration* audio_set_configuration,

      types::LeAudioContextType context_type,

      types::LeAudioConfigurationStrategy required_snk_strategy);

system/bta/le_audio/devices_test.cc

+210 −37

File changed.

Preview size limit exceeded, changes collapsed.