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

Commit fa36ee6f authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "Rename le_audio namespace to bluetooth::le_audio" into main am: 6972ef50 am: ec7ca861 

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



Change-Id: I0329f8d91ca3ba1f06371767c3c4eebbd5b2f7d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3055641 ec7ca861

system/audio_hal_interface/aidl/le_audio_software_aidl.cc

+64 −50
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ using ::bluetooth::audio::aidl::BluetoothAudioCtrlAck; 
using ::bluetooth::audio::le_audio::LeAudioClientInterface;

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

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

using ::le_audio::set_configurations::SetConfiguration;

using ::le_audio::types::LeAudioCoreCodecConfig;

using ::bluetooth::le_audio::set_configurations::SetConfiguration;

using ::bluetooth::le_audio::types::LeAudioCoreCodecConfig;



static ChannelMode le_audio_channel_mode2audio_hal(uint8_t channels_count) {

  switch (channels_count) {
@@ -297,7 +297,7 @@ void LeAudioTransport::LeAudioSetSelectedHalPcmConfig(uint32_t sample_rate_hz, 
}



void LeAudioTransport::LeAudioSetBroadcastConfig(

    const ::le_audio::broadcast_offload_config& offload_config) {

    const ::bluetooth::le_audio::broadcast_offload_config& offload_config) {

  broadcast_config_.streamMap.resize(0);

  for (auto& [handle, location] : offload_config.stream_map) {

    Lc3Configuration lc3_config{
@@ -440,7 +440,7 @@ void LeAudioSinkTransport::LeAudioSetSelectedHalPcmConfig( 
}



void LeAudioSinkTransport::LeAudioSetBroadcastConfig(

    const ::le_audio::broadcast_offload_config& offload_config) {

    const ::bluetooth::le_audio::broadcast_offload_config& offload_config) {

  transport_->LeAudioSetBroadcastConfig(offload_config);

}
@@ -557,41 +557,51 @@ void LeAudioSourceTransport::SetStartRequestState(StartRequestState state) { 
}



std::unordered_map<int32_t, uint8_t> sampling_freq_map{

    {8000, ::le_audio::codec_spec_conf::kLeAudioSamplingFreq8000Hz},

    {16000, ::le_audio::codec_spec_conf::kLeAudioSamplingFreq16000Hz},

    {24000, ::le_audio::codec_spec_conf::kLeAudioSamplingFreq24000Hz},

    {32000, ::le_audio::codec_spec_conf::kLeAudioSamplingFreq32000Hz},

    {44100, ::le_audio::codec_spec_conf::kLeAudioSamplingFreq44100Hz},

    {48000, ::le_audio::codec_spec_conf::kLeAudioSamplingFreq48000Hz},

    {88200, ::le_audio::codec_spec_conf::kLeAudioSamplingFreq88200Hz},

    {96000, ::le_audio::codec_spec_conf::kLeAudioSamplingFreq96000Hz},

    {176400, ::le_audio::codec_spec_conf::kLeAudioSamplingFreq176400Hz},

    {192000, ::le_audio::codec_spec_conf::kLeAudioSamplingFreq192000Hz}};

    {8000, ::bluetooth::le_audio::codec_spec_conf::kLeAudioSamplingFreq8000Hz},

    {16000,

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioSamplingFreq16000Hz},

    {24000,

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioSamplingFreq24000Hz},

    {32000,

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioSamplingFreq32000Hz},

    {44100,

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioSamplingFreq44100Hz},

    {48000,

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioSamplingFreq48000Hz},

    {88200,

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioSamplingFreq88200Hz},

    {96000,

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioSamplingFreq96000Hz},

    {176400,

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioSamplingFreq176400Hz},

    {192000,

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioSamplingFreq192000Hz}};



std::unordered_map<int32_t, uint8_t> frame_duration_map{

    {7500, ::le_audio::codec_spec_conf::kLeAudioCodecFrameDur7500us},

    {10000, ::le_audio::codec_spec_conf::kLeAudioCodecFrameDur10000us}};

    {7500, ::bluetooth::le_audio::codec_spec_conf::kLeAudioCodecFrameDur7500us},

    {10000,

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioCodecFrameDur10000us}};



std::unordered_map<int32_t, uint16_t> octets_per_frame_map{

    {30, ::le_audio::codec_spec_conf::kLeAudioCodecFrameLen30},

    {40, ::le_audio::codec_spec_conf::kLeAudioCodecFrameLen40},

    {60, ::le_audio::codec_spec_conf::kLeAudioCodecFrameLen60},

    {80, ::le_audio::codec_spec_conf::kLeAudioCodecFrameLen80},

    {100, ::le_audio::codec_spec_conf::kLeAudioCodecFrameLen100},

    {120, ::le_audio::codec_spec_conf::kLeAudioCodecFrameLen120}};

    {30, ::bluetooth::le_audio::codec_spec_conf::kLeAudioCodecFrameLen30},

    {40, ::bluetooth::le_audio::codec_spec_conf::kLeAudioCodecFrameLen40},

    {60, ::bluetooth::le_audio::codec_spec_conf::kLeAudioCodecFrameLen60},

    {80, ::bluetooth::le_audio::codec_spec_conf::kLeAudioCodecFrameLen80},

    {100, ::bluetooth::le_audio::codec_spec_conf::kLeAudioCodecFrameLen100},

    {120, ::bluetooth::le_audio::codec_spec_conf::kLeAudioCodecFrameLen120}};



std::unordered_map<AudioLocation, uint32_t> audio_location_map{

    {AudioLocation::UNKNOWN,

     ::le_audio::codec_spec_conf::kLeAudioLocationFrontCenter},

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioLocationFrontCenter},

    {AudioLocation::FRONT_LEFT,

     ::le_audio::codec_spec_conf::kLeAudioLocationFrontLeft},

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioLocationFrontLeft},

    {AudioLocation::FRONT_RIGHT,

     ::le_audio::codec_spec_conf::kLeAudioLocationFrontRight},

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioLocationFrontRight},

    {static_cast<AudioLocation>(

         static_cast<uint8_t>(AudioLocation::FRONT_LEFT) |

         static_cast<uint8_t>(AudioLocation::FRONT_RIGHT)),

     ::le_audio::codec_spec_conf::kLeAudioLocationFrontLeft |

         ::le_audio::codec_spec_conf::kLeAudioLocationFrontRight}};

     ::bluetooth::le_audio::codec_spec_conf::kLeAudioLocationFrontLeft |

         ::bluetooth::le_audio::codec_spec_conf::kLeAudioLocationFrontRight}};



bool hal_ucast_capability_to_stack_format(

    const UnicastCapability& hal_capability,
@@ -632,20 +642,21 @@ bool hal_ucast_capability_to_stack_format( 
    return false;

  }



  stack_capability.id = ::le_audio::set_configurations::LeAudioCodecIdLc3;

  stack_capability.id =

      ::bluetooth::le_audio::set_configurations::LeAudioCodecIdLc3;

  stack_capability.channel_count_per_iso_stream = channel_count;



  stack_capability.params.Add(

      ::le_audio::codec_spec_conf::kLeAudioLtvTypeSamplingFreq,

      ::bluetooth::le_audio::codec_spec_conf::kLeAudioLtvTypeSamplingFreq,

      sampling_freq_map[sample_rate_hz]);

  stack_capability.params.Add(

      ::le_audio::codec_spec_conf::kLeAudioLtvTypeFrameDuration,

      ::bluetooth::le_audio::codec_spec_conf::kLeAudioLtvTypeFrameDuration,

      frame_duration_map[frame_duration_us]);

  stack_capability.params.Add(

      ::le_audio::codec_spec_conf::kLeAudioLtvTypeAudioChannelAllocation,

  stack_capability.params.Add(::bluetooth::le_audio::codec_spec_conf::

                                  kLeAudioLtvTypeAudioChannelAllocation,

                              audio_location_map[supported_channel]);

  stack_capability.params.Add(

      ::le_audio::codec_spec_conf::kLeAudioLtvTypeOctetsPerCodecFrame,

  stack_capability.params.Add(::bluetooth::le_audio::codec_spec_conf::

                                  kLeAudioLtvTypeOctetsPerCodecFrame,

                              octets_per_frame_map[octets_per_frame]);

  return true;

}
@@ -694,20 +705,21 @@ bool hal_bcast_capability_to_stack_format( 
    return false;

  }



  stack_capability.id = ::le_audio::set_configurations::LeAudioCodecIdLc3;

  stack_capability.id =

      ::bluetooth::le_audio::set_configurations::LeAudioCodecIdLc3;

  stack_capability.channel_count_per_iso_stream = channel_count;



  stack_capability.params.Add(

      ::le_audio::codec_spec_conf::kLeAudioLtvTypeSamplingFreq,

      ::bluetooth::le_audio::codec_spec_conf::kLeAudioLtvTypeSamplingFreq,

      sampling_freq_map[sample_rate_hz]);

  stack_capability.params.Add(

      ::le_audio::codec_spec_conf::kLeAudioLtvTypeFrameDuration,

      ::bluetooth::le_audio::codec_spec_conf::kLeAudioLtvTypeFrameDuration,

      frame_duration_map[frame_duration_us]);

  stack_capability.params.Add(

      ::le_audio::codec_spec_conf::kLeAudioLtvTypeAudioChannelAllocation,

  stack_capability.params.Add(::bluetooth::le_audio::codec_spec_conf::

                                  kLeAudioLtvTypeAudioChannelAllocation,

                              audio_location_map[supported_channel]);

  stack_capability.params.Add(

      ::le_audio::codec_spec_conf::kLeAudioLtvTypeOctetsPerCodecFrame,

  stack_capability.params.Add(::bluetooth::le_audio::codec_spec_conf::

                                  kLeAudioLtvTypeOctetsPerCodecFrame,

                              octets_per_frame_map[octets_per_frame]);

  return true;

}
@@ -736,7 +748,8 @@ std::vector<AudioSetConfiguration> get_offload_capabilities() { 


    if (hal_ucast_capability_to_stack_format(hal_encode_cap, encode_cap)) {

      audio_set_config.confs.push_back(SetConfiguration(

          ::le_audio::types::kLeAudioDirectionSink, hal_encode_cap.deviceCount,

          ::bluetooth::le_audio::types::kLeAudioDirectionSink,

          hal_encode_cap.deviceCount,

          hal_encode_cap.deviceCount * hal_encode_cap.channelCountPerDevice,

          encode_cap));

      str_capability_log = " Encode Capability: " + hal_encode_cap.toString();
@@ -744,7 +757,7 @@ std::vector<AudioSetConfiguration> get_offload_capabilities() { 


    if (hal_ucast_capability_to_stack_format(hal_decode_cap, decode_cap)) {

      audio_set_config.confs.push_back(SetConfiguration(

          ::le_audio::types::kLeAudioDirectionSource,

          ::bluetooth::le_audio::types::kLeAudioDirectionSource,

          hal_decode_cap.deviceCount,

          hal_decode_cap.deviceCount * hal_decode_cap.channelCountPerDevice,

          decode_cap));
@@ -753,8 +766,9 @@ std::vector<AudioSetConfiguration> get_offload_capabilities() { 


    if (hal_bcast_capability_to_stack_format(hal_bcast_cap, bcast_cap)) {

      // Set device_cnt, ase_cnt to zero to ignore these fields for broadcast

      audio_set_config.confs.push_back(SetConfiguration(

          ::le_audio::types::kLeAudioDirectionSink, 0, 0, bcast_cap));

      audio_set_config.confs.push_back(

          SetConfiguration(::bluetooth::le_audio::types::kLeAudioDirectionSink,

                           0, 0, bcast_cap));

      str_capability_log +=

          " Broadcast Capability: " + hal_bcast_cap.toString();

    }
@@ -774,7 +788,7 @@ std::vector<AudioSetConfiguration> get_offload_capabilities() { 
}



AudioConfiguration offload_config_to_hal_audio_config(

    const ::le_audio::offload_config& offload_config) {

    const ::bluetooth::le_audio::offload_config& offload_config) {

  Lc3Configuration lc3_config{

      .pcmBitDepth = static_cast<int8_t>(offload_config.bits_per_sample),

      .samplingFrequencyHz = static_cast<int32_t>(offload_config.sampling_rate),

system/audio_hal_interface/aidl/le_audio_software_aidl.h

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

using ::bluetooth::audio::aidl::LatencyMode;

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

using ::le_audio::DsaMode;

using ::le_audio::set_configurations::AudioSetConfiguration;

using ::le_audio::set_configurations::CodecConfigSetting;

using ::bluetooth::le_audio::DsaMode;

using ::bluetooth::le_audio::set_configurations::AudioSetConfiguration;

using ::bluetooth::le_audio::set_configurations::CodecConfigSetting;



constexpr uint8_t kChannelNumberMono = 1;

constexpr uint8_t kChannelNumberStereo = 2;
@@ -61,7 +61,7 @@ bool hal_ucast_capability_to_stack_format( 
    const UnicastCapability& ucast_capability,

    CodecConfigSetting& stack_capability);

AudioConfiguration offload_config_to_hal_audio_config(

    const ::le_audio::offload_config& offload_config);

    const ::bluetooth::le_audio::offload_config& offload_config);



std::vector<AudioSetConfiguration> get_offload_capabilities();
@@ -101,7 +101,7 @@ class LeAudioTransport { 
                                      uint32_t data_interval);



  void LeAudioSetBroadcastConfig(

      const ::le_audio::broadcast_offload_config& offload_config);

      const ::bluetooth::le_audio::broadcast_offload_config& offload_config);



  const LeAudioBroadcastConfiguration& LeAudioGetBroadcastConfig();
@@ -165,7 +165,7 @@ class LeAudioSinkTransport 
                                      uint32_t data_interval);



  void LeAudioSetBroadcastConfig(

      const ::le_audio::broadcast_offload_config& offload_config);

      const ::bluetooth::le_audio::broadcast_offload_config& offload_config);



  const LeAudioBroadcastConfiguration& LeAudioGetBroadcastConfig();

system/audio_hal_interface/fuzzer/libbt_audio_hal_le_audio_software_fuzzer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ bool onResume(bool) { return true; } 


bool onSuspend(void) { return true; }



bool onMetadataUpdate(const source_metadata_v7_t&, le_audio::DsaMode) {

bool onMetadataUpdate(const source_metadata_v7_t&,

                      bluetooth::le_audio::DsaMode) {

  return true;

}

system/audio_hal_interface/hidl/le_audio_software_hidl.cc

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ using ::bluetooth::audio::hidl::SessionType_2_1; 


using ::bluetooth::audio::le_audio::LeAudioClientInterface;

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

using ::le_audio::DsaMode;

using ::bluetooth::le_audio::DsaMode;



/**

 * Helper utils

system/audio_hal_interface/hidl/le_audio_software_hidl.h

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 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::CodecConfigSetting;

using ::bluetooth::le_audio::set_configurations::AudioSetConfiguration;

using ::bluetooth::le_audio::set_configurations::CodecConfigSetting;



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