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

Commit 64ba3ab1 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Extract target latency to the json file" am: 2f27ccba 

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

Change-Id: I5a7bb25310b53d811f052622747748152867e66d
parents 0330727b 2f27ccba

system/audio_hal_interface/aidl/le_audio_software.cc

+4 −1
Original line number Diff line number Diff line
@@ -432,7 +432,9 @@ 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,

          ::le_audio::types::kLeAudioDirectionSink,

          ::le_audio::types::kTargetLatencyBalancedLatencyReliability,

          hal_encode_cap.deviceCount,

          hal_encode_cap.deviceCount * hal_encode_cap.channelCountPerDevice,

          encode_cap));

      str_capability_log = " Encode Capability: " + hal_encode_cap.toString();
@@ -441,6 +443,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,

          ::le_audio::types::kTargetLatencyBalancedLatencyReliability,

          hal_decode_cap.deviceCount,

          hal_decode_cap.deviceCount * hal_decode_cap.channelCountPerDevice,

          decode_cap));

system/audio_hal_interface/hidl/le_audio_software_hidl.cc

+0 −1
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ bool LeAudioSourceTransport::IsPendingStartStream(void) { 
void LeAudioSourceTransport::ClearPendingStartStream(void) {

  transport_->ClearPendingStartStream();

}



}  // namespace le_audio

}  // namespace hidl

}  // namespace audio

system/bta/le_audio/audio_set_configurations.fbs

+6 −0
Original line number Diff line number Diff line
@@ -50,7 +50,13 @@ enum AudioSetConfigurationDirection : byte { 
    SINK = 0x01,

    SOURCE = 0x02,

}

enum AudioSetConfigurationTargetLatency : byte {

    LOW = 0x01,

    BALANCED_RELIABILITY = 0x02,

    HIGH_RELIABILITY = 0x03,

}

table AudioSetSubConfiguration {

    target_latency: AudioSetConfigurationTargetLatency = BALANCED_RELIABILITY;

    device_cnt: ubyte;

    ase_cnt: ubyte;

    direction: AudioSetConfigurationDirection = SINK;

system/bta/le_audio/devices.cc

+3 −6
Original line number Diff line number Diff line
@@ -312,11 +312,6 @@ uint8_t LeAudioDeviceGroup::GetFraming(void) { 
  return kIsoCigFramingUnframed;

}



uint8_t LeAudioDeviceGroup::GetTargetLatency(void) {

  /* TODO: Decide about target latency */

  return types::kTargetLatencyBalancedLatencyReliability;

}



/* TODO: Preferred parameter may be other than minimum */

static uint16_t find_max_transport_latency(LeAudioDeviceGroup* group,

                                           uint8_t direction) {
@@ -944,6 +939,7 @@ bool LeAudioDevice::ConfigureAses( 
    if (ase->state == AseState::BTA_LE_AUDIO_ASE_STATE_CODEC_CONFIGURED)

      ase->reconfigure = true;



    ase->target_latency = ent.target_latency;

    ase->codec_id = ent.codec.id;

    /* TODO: find better way to not use LC3 explicitly */

    ase->codec_config = std::get<LeAudioLc3Config>(ent.codec.config);
@@ -968,7 +964,8 @@ bool LeAudioDevice::ConfigureAses( 
               << ", activated ASE id=" << +ase->id

               << ", direction=" << +ase->direction

               << ", max_sdu_size=" << +ase->max_sdu_size

               << ", cis_id=" << +ase->cis_id;

               << ", cis_id=" << +ase->cis_id

               << ", target_latency=" << +ent.target_latency;



    ase = GetFirstInactiveAse(ent.direction, reconnect);

  }

system/bta/le_audio/devices.h

+0 −1
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ class LeAudioDeviceGroup { 
  uint8_t GetSCA(void);

  uint8_t GetPacking(void);

  uint8_t GetFraming(void);

  uint8_t GetTargetLatency(void);

  uint16_t GetMaxTransportLatencyStom(void);

  uint16_t GetMaxTransportLatencyMtos(void);

  void SetTransportLatency(uint8_t direction, uint32_t transport_latency_us);