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

Commit 2886c6c2 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge changes Idaf3ed15,I8613df78,I132c7667,I050f310b,I80459064, ... am: 50383a6f 

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



Change-Id: I98f2e8d5e16a2c6561283630df796326a4abf26e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 19fb26aa 50383a6f

system/audio_hal_interface/aidl/le_audio_software_aidl.cc

+2 −5
Original line number Diff line number Diff line
@@ -584,7 +584,6 @@ std::vector<AudioSetConfiguration> get_offload_capabilities() { 
      audio_set_config.confs.push_back(SetConfiguration(

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

          hal_encode_cap.deviceCount * hal_encode_cap.channelCountPerDevice,

          ::le_audio::types::kTargetLatencyBalancedLatencyReliability,

          encode_cap));

      str_capability_log = " Encode Capability: " + hal_encode_cap.toString();

    }
@@ -594,16 +593,14 @@ std::vector<AudioSetConfiguration> get_offload_capabilities() { 
          ::le_audio::types::kLeAudioDirectionSource,

          hal_decode_cap.deviceCount,

          hal_decode_cap.deviceCount * hal_decode_cap.channelCountPerDevice,

          ::le_audio::types::kTargetLatencyBalancedLatencyReliability,

          decode_cap));

      str_capability_log += " Decode Capability: " + hal_decode_cap.toString();

    }



    if (hal_bcast_capability_to_stack_format(hal_bcast_cap, bcast_cap)) {

      // Set device_cnt, ase_cnt, target_latency to zero to ignore these fields

      // for broadcast

      // 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, 0, bcast_cap));

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

      str_capability_log +=

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

    }

system/bta/le_audio/audio_set_configurations.fbs

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ enum AudioSetConfigurationTargetLatency : byte { 
    HIGH_RELIABILITY = 0x03,

}

table AudioSetSubConfiguration {

    target_latency: AudioSetConfigurationTargetLatency = BALANCED_RELIABILITY;

    device_cnt: ubyte;

    ase_cnt: ubyte;

    direction: AudioSetConfigurationDirection = SINK;
@@ -70,6 +69,7 @@ table CodecConfiguration { 
}

table QosConfiguration {

    name: string (key, required);

    target_latency: AudioSetConfigurationTargetLatency = BALANCED_RELIABILITY;

    retransmission_number: ubyte;

    max_transport_latency : ushort;

}