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

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

Merge changes I8c1922b2,Ie8c35ba5,I2c7a2738,I03d22725,I89faef9f into main 

* changes:
  AIDL/LeAudio: Clean-up the dead code
  LeAudio: Minor const-correctness fix
  LeAudio: Improve codec spec. capabilities type names
  LeAudio: Fix unsuported offload capabilities config
  LeAudio: Rename codec specific structure
parents 3e89475f 698866f3

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 −6
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;
@@ -54,17 +54,13 @@ constexpr uint8_t kBitsPerSample32 = 32; 


using ::bluetooth::audio::le_audio::StreamCallbacks;



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);



bool is_source_hal_enabled();

bool is_sink_hal_enabled();



std::vector<AudioSetConfiguration> get_offload_capabilities();



class LeAudioTransport {

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/audio_hal_client/audio_hal_client.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct LeAudioCodecConfiguration { 
            (data_interval_us == other.data_interval_us));

  }



  bool IsInvalid() {

  bool IsInvalid() const {

    return (num_channels == 0) || (sample_rate == 0) ||

           (bits_per_sample == 0) || (data_interval_us == 0);

  }

system/bta/le_audio/client.cc

+2 −2
Original line number Diff line number Diff line
@@ -1043,8 +1043,8 @@ class LeAudioClientImpl : public LeAudioClient { 
  }



  void StartAudioSession(LeAudioDeviceGroup* group,

                         LeAudioCodecConfiguration* source_config,

                         LeAudioCodecConfiguration* sink_config) {

                         const LeAudioCodecConfiguration* source_config,

                         const LeAudioCodecConfiguration* sink_config) {

    /* This function is called when group is not yet set to active.

     * This is why we don't have to check if session is started already.

     * Just check if it is acquired.