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

Commit ca5b072e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update HAL structure to include offload capability for unicast and broadcast" am: 45d6fb42 

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

Change-Id: I7c94e6a989b8092bb547d15cc88c522282a39224
parents 08097533 45d6fb42

system/audio_hal_interface/le_audio_software.cc

+6 −6
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ using ::bluetooth::audio::le_audio::LeAudioClientInterface; 
using ::bluetooth::audio::le_audio::StreamCallbacks;

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

using AudioCapabilities_2_2 =

using AudioCapabilities_2_2 =

    ::android::hardware::bluetooth::audio::V2_2::AudioCapabilities;

    ::android::hardware::bluetooth::audio::V2_2::AudioCapabilities;

using android::hardware::bluetooth::audio::V2_2::LeAudioCodecCapability;

using android::hardware::bluetooth::audio::V2_2::UnicastCapability;





using ::le_audio::CodecManager;

using ::le_audio::CodecManager;

using ::le_audio::set_configurations::AudioSetConfiguration;

using ::le_audio::set_configurations::AudioSetConfiguration;
@@ -406,7 +406,7 @@ std::unordered_map<AudioLocation, uint32_t> audio_location_map{ 
         ::le_audio::codec_spec_conf::kLeAudioLocationFrontRight}};

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





bool halConfigToCodecCapabilitySetting(

bool halConfigToCodecCapabilitySetting(

    LeAudioCodecCapability halConfig, CodecCapabilitySetting& codecCapability) {

    UnicastCapability halConfig, CodecCapabilitySetting& codecCapability) {

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

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

    LOG(WARNING) << "Unsupported codecType: " << toString(halConfig.codecType);

    LOG(WARNING) << "Unsupported codecType: " << toString(halConfig.codecType);

    return false;

    return false;
@@ -455,10 +455,10 @@ std::vector<AudioSetConfiguration> get_offload_capabilities() { 
  for (auto halCapability : le_audio_hal_capabilities) {

  for (auto halCapability : le_audio_hal_capabilities) {

    CodecCapabilitySetting encodeCapability;

    CodecCapabilitySetting encodeCapability;

    CodecCapabilitySetting decodeCapability;

    CodecCapabilitySetting decodeCapability;

    LeAudioCodecCapability halEncodeConfig =

    UnicastCapability halEncodeConfig =

        halCapability.leAudioCapabilities().encodeCapability;

        halCapability.leAudioCapabilities().unicastEncodeCapability;

    LeAudioCodecCapability halDecodeConfig =

    UnicastCapability halDecodeConfig =

        halCapability.leAudioCapabilities().decodeCapability;

        halCapability.leAudioCapabilities().unicastDecodeCapability;

    AudioSetConfiguration audioSetConfig = {.name = "offload capability"};

    AudioSetConfiguration audioSetConfig = {.name = "offload capability"};

    strCapabilityLog.clear();

    strCapabilityLog.clear();