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

Commit d89968f7 authored by Bao Do's avatar Bao Do Committed by Automerger Merge Worker
Browse files

Merge changes I478fc99b,I2150459b into main am: 740301ed am: 3109049d 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3074307



Change-Id: Ic5e29f3452fdf084c04821b679998202aab25821
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84bef270 3109049d

bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.cpp

+7 −6
Original line number Diff line number Diff line
@@ -184,13 +184,14 @@ ndk::ScopedAStatus BluetoothAudioProviderFactory::getProviderInfo( 
          SessionType::LE_AUDIO_BROADCAST_HARDWARE_OFFLOAD_ENCODING_DATAPATH) {

    std::vector<CodecInfo> db_codec_info =

        BluetoothAudioCodecs::GetLeAudioOffloadCodecInfo(session_type);

    if (!db_codec_info.empty()) {

    // Return provider info supports without checking db_codec_info

    // This help with various flow implementation for multidirectional support.

    auto& provider_info = _aidl_return->emplace();

    provider_info.supportsMultidirectionalCapabilities = true;

    provider_info.name = kLeAudioOffloadProviderName;

    provider_info.codecInfos = db_codec_info;

    return ndk::ScopedAStatus::ok();

  }

  }



  if (session_type == SessionType::HFP_HARDWARE_OFFLOAD_DATAPATH) {

    std::vector<CodecInfo> db_codec_info =

bluetooth/audio/aidl/default/LeAudioOffloadAudioProvider.cpp

+383 −200

File changed.

Preview size limit exceeded, changes collapsed.

bluetooth/audio/aidl/default/LeAudioOffloadAudioProvider.h

+13 −6
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ class LeAudioOffloadAudioProvider : public BluetoothAudioProvider { 


  // Private matching function definitions

  bool isMatchedValidCodec(CodecId cfg_codec, CodecId req_codec);

  bool isCapabilitiesMatchedContext(

      AudioContext setting_context,

  bool filterCapabilitiesMatchedContext(

      AudioContext& setting_context,

      const IBluetoothAudioProvider::LeAudioDeviceCapabilities& capabilities);

  bool isMatchedSamplingFreq(

      CodecSpecificConfigurationLtv::SamplingFrequency& cfg_freq,
@@ -134,11 +134,10 @@ class LeAudioOffloadAudioProvider : public BluetoothAudioProvider { 
      std::vector<std::optional<AseDirectionConfiguration>>&

          valid_direction_configurations);

  void filterRequirementAseDirectionConfiguration(

      std::vector<std::optional<AseDirectionConfiguration>>&

      std::optional<std::vector<std::optional<AseDirectionConfiguration>>>&

          direction_configurations,

      const std::optional<std::vector<std::optional<AseDirectionRequirement>>>&

          requirements,

      std::vector<std::optional<AseDirectionConfiguration>>&

      const std::vector<std::optional<AseDirectionRequirement>>& requirements,

      std::optional<std::vector<std::optional<AseDirectionConfiguration>>>&

          valid_direction_configurations);

  std::optional<LeAudioAseConfigurationSetting>

  getCapabilitiesMatchedAseConfigurationSettings(
@@ -157,6 +156,14 @@ class LeAudioOffloadAudioProvider : public BluetoothAudioProvider { 
      LeAudioBroadcastConfigurationSetting& setting,

      const IBluetoothAudioProvider::LeAudioDeviceCapabilities& capabilities);

  void getBroadcastSettings();

  std::optional<LeAudioAseQosConfiguration> getDirectionQosConfiguration(

      uint8_t direction,

      const IBluetoothAudioProvider::LeAudioAseQosConfigurationRequirement&

          qosRequirement,

      std::vector<LeAudioAseConfigurationSetting>& ase_configuration_settings);

  bool isSubgroupConfigurationMatchedContext(

      AudioContext requirement_context,

      LeAudioBroadcastSubgroupConfiguration configuration);

};



class LeAudioOffloadOutputAudioProvider : public LeAudioOffloadAudioProvider {

bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp

+1406 −166

File changed.

Preview size limit exceeded, changes collapsed.