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

Commit 35d9faff authored by Jakub Tyszkowski's avatar Jakub Tyszkowski
Browse files

LeAudio: Rename codec specific structure 

To not confuse CodecCapabilitySetting with the PAC service
codec cpabilities, and since this structure is being used to pass
the codec specific configuration (in codec manager and audio
set configuration provider), it was renamed to CodecConfigSetting.

In future this should wrap not only tha base configuration for the
already known codec specific parameter types, but also the vendor
specific ones, thus will migrate from LeAudioCodecConfigBase to more
generic LTV map.

Bug: 295972694
Test: atest --host bluetooth_le_audio_test bluetooth_le_audio_client_test bluetooth_test_broadcaster bluetooth_test_broadcaster_state_machine bluetooth_le_audio_codec_manager_test
Change-Id: I89faef9f2facb7a498f972ffe1562ffd87a09d5f
parent 0c3df631

system/audio_hal_interface/aidl/le_audio_software_aidl.cc

+3 −3
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ std::unordered_map<AudioLocation, uint32_t> audio_location_map{ 


bool hal_ucast_capability_to_stack_format(

    const UnicastCapability& hal_capability,

    CodecCapabilitySetting& stack_capability) {

    CodecConfigSetting& stack_capability) {

  if (hal_capability.codecType != CodecType::LC3) {

    LOG(WARNING) << "Unsupported codecType: "

                 << toString(hal_capability.codecType);
@@ -513,7 +513,7 @@ bool hal_ucast_capability_to_stack_format( 


bool hal_bcast_capability_to_stack_format(

    const BroadcastCapability& hal_bcast_capability,

    CodecCapabilitySetting& stack_capability) {

    CodecConfigSetting& stack_capability) {

  if (hal_bcast_capability.codecType != CodecType::LC3) {

    LOG(WARNING) << "Unsupported codecType: "

                 << toString(hal_bcast_capability.codecType);
@@ -574,7 +574,7 @@ std::vector<AudioSetConfiguration> get_offload_capabilities() { 
  std::string str_capability_log;



  for (auto hal_cap : le_audio_hal_capabilities) {

    CodecCapabilitySetting encode_cap, decode_cap, bcast_cap;

    CodecConfigSetting encode_cap, decode_cap, bcast_cap;

    UnicastCapability hal_encode_cap =

        hal_cap.get<AudioCapabilities::leAudioCapabilities>()

            .unicastEncodeCapability;

system/audio_hal_interface/aidl/le_audio_software_aidl.h

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ using ::aidl::android::hardware::bluetooth::audio::UnicastCapability; 
using ::bluetooth::audio::aidl::BluetoothAudioCtrlAck;

using ::bluetooth::audio::le_audio::StartRequestState;

using ::le_audio::set_configurations::AudioSetConfiguration;

using ::le_audio::set_configurations::CodecCapabilitySetting;

using ::le_audio::set_configurations::CodecConfigSetting;



constexpr uint8_t kChannelNumberMono = 1;

constexpr uint8_t kChannelNumberStereo = 2;
@@ -58,7 +58,7 @@ void flush_sink(); 
void flush_source();

bool hal_ucast_capability_to_stack_format(

    const UnicastCapability& ucast_capability,

    CodecCapabilitySetting& stack_capability);

    CodecConfigSetting& stack_capability);

AudioConfiguration offload_config_to_hal_audio_config(

    const ::le_audio::offload_config& offload_config);

system/audio_hal_interface/hidl/le_audio_software_hidl.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ namespace le_audio { 
using ::android::hardware::bluetooth::audio::V2_1::PcmParameters;

using ::bluetooth::audio::hidl::BluetoothAudioCtrlAck;

using ::le_audio::set_configurations::AudioSetConfiguration;

using ::le_audio::set_configurations::CodecCapabilitySetting;

using ::le_audio::set_configurations::CodecConfigSetting;



using ::bluetooth::audio::le_audio::StartRequestState;

system/bta/le_audio/codec_manager.cc

+2 −2
Original line number Diff line number Diff line
@@ -389,8 +389,8 @@ struct codec_manager_impl { 
  }



  bool IsLc3ConfigMatched(

      const set_configurations::CodecCapabilitySetting& adsp_config,

      const set_configurations::CodecCapabilitySetting& target_config) {

      const set_configurations::CodecConfigSetting& adsp_config,

      const set_configurations::CodecConfigSetting& target_config) {

    if (adsp_config.id.coding_format != types::kLeAudioCodingFormatLC3 ||

        target_config.id.coding_format != types::kLeAudioCodingFormatLC3) {

      return false;

system/bta/le_audio/devices.cc

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
using bluetooth::hci::kIsoCigPhy1M;

using bluetooth::hci::kIsoCigPhy2M;

using le_audio::DeviceConnectState;

using le_audio::set_configurations::CodecCapabilitySetting;

using le_audio::set_configurations::CodecConfigSetting;

using le_audio::types::ase;

using le_audio::types::AseState;

using le_audio::types::AudioContexts;
@@ -673,7 +673,7 @@ uint8_t LeAudioDevice::GetLc3SupportedChannelCount(uint8_t direction) { 


const struct types::acs_ac_record*

LeAudioDevice::GetCodecConfigurationSupportedPac(

    uint8_t direction, const CodecCapabilitySetting& codec_capability_setting) {

    uint8_t direction, const CodecConfigSetting& codec_capability_setting) {

  auto& pacs =

      direction == types::kLeAudioDirectionSink ? snk_pacs_ : src_pacs_;
@@ -689,7 +689,7 @@ LeAudioDevice::GetCodecConfigurationSupportedPac( 
    auto& pac_recs = std::get<1>(pac_tuple);



    for (const auto& pac : pac_recs) {

      if (!IsCodecCapabilitySettingSupported(pac, codec_capability_setting))

      if (!IsCodecConfigSettingSupported(pac, codec_capability_setting))

        continue;



      return &pac;