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

Commit 04a9b591 authored by Myles Watson's avatar Myles Watson
Browse files

Use GD controller to set DAB time 

Bug: 301661850
Test: atest bluetooth_test_gd_unit
Flag: EXEMPT, no logical change, GD code path
Change-Id: I52119b90f792e964dfb059ddb12cda13cecb1315
parent 97337c62

system/btif/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -153,12 +153,14 @@ cc_library_static { 
        "lib-bt-packets-base",

        "libaudio-a2dp-hw-utils",

        "libbluetooth-types",

        "libbluetooth_hci_pdl",

        "libbt-audio-hal-interface",

        "libbt-platform-protos-lite",

        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbtif-core",

        "libflatbuffers-cpp",

    ],

    shared_libs: [

        "android.hardware.bluetooth.audio@2.1",
@@ -236,11 +238,13 @@ cc_library_static { 
        "lib-bt-packets-base",

        "libaudio-a2dp-hw-utils",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_hci_pdl",

        "libbt-audio-hal-interface",

        "libbt-jni-thread",

        "libbt-platform-protos-lite",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libflatbuffers-cpp",

        "libstatslog_bt",

    ],

    whole_static_libs: [

system/btif/src/btif_core.cc

+4 −50
Original line number Diff line number Diff line
@@ -49,8 +49,10 @@ 
#include "common/message_loop_thread.h"

#include "device/include/controller.h"

#include "device/include/device_iot_config.h"

#include "hci/controller.h"

#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "main/shim/entry.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/future.h"
@@ -729,48 +731,6 @@ void btif_disable_service(tBTA_SERVICE_ID service_id) { 
  }

}



void DynamicAudiobufferSizeCompleteCallback(tBTM_VSC_CMPL* p_vsc_cmpl_params) {

  LOG(INFO) << __func__;



  if (p_vsc_cmpl_params->param_len < 1) {

    LOG(ERROR) << __func__

               << ": The length of returned parameters is less than 1";

    return;

  }

  uint8_t* p_event_param_buf = p_vsc_cmpl_params->p_param_buf;

  uint8_t status = 0xff;

  uint8_t opcode = 0xff;

  uint16_t respond_buffer_time = 0xffff;



  // [Return Parameter]         | [Size]   | [Purpose]

  // Status                     | 1 octet  | Command complete status

  // Dynamic_Audio_Buffer_opcode| 1 octet  | 0x02 - Set buffer time

  // Audio_Codec_Buffer_Time    | 2 octet  | Current buffer time

  STREAM_TO_UINT8(status, p_event_param_buf);

  if (status != HCI_SUCCESS) {

    LOG(ERROR) << __func__

               << ": Fail to configure DFTB. status: " << loghex(status);

    return;

  }



  if (p_vsc_cmpl_params->param_len != 4) {

    LOG(FATAL) << __func__

               << ": The length of returned parameters is not equal to 4: "

               << std::to_string(p_vsc_cmpl_params->param_len);

    return;

  }



  STREAM_TO_UINT8(opcode, p_event_param_buf);

  LOG(INFO) << __func__ << ": opcode = " << loghex(opcode);



  if (opcode == 0x02) {

    STREAM_TO_UINT16(respond_buffer_time, p_event_param_buf);

    LOG(INFO) << __func__

              << ": Succeed to configure Media Tx Buffer, used_buffer_time = "

              << loghex(respond_buffer_time);

  }

}



bt_status_t btif_set_dynamic_audio_buffer_size(int codec, int size) {

  LOG_VERBOSE("%s", __func__);
@@ -787,17 +747,11 @@ bt_status_t btif_set_dynamic_audio_buffer_size(int codec, int size) { 
    if (cmn_vsc_cb.dynamic_audio_buffer_support != 0) {

      LOG_VERBOSE("%s Set buffer size (%d) for A2DP offload", __func__, size);

      uint16_t firmware_tx_buffer_length_byte;

      uint8_t param[3] = {0};

      uint8_t* p_param = param;



      firmware_tx_buffer_length_byte = static_cast<uint16_t>(size);

      LOG(INFO) << __func__ << "firmware_tx_buffer_length_byte: "

                << firmware_tx_buffer_length_byte;



      UINT8_TO_STREAM(p_param, HCI_CONTROLLER_DAB_SET_BUFFER_TIME);

      UINT16_TO_STREAM(p_param, firmware_tx_buffer_length_byte);

      BTM_VendorSpecificCommand(HCI_CONTROLLER_DAB, p_param - param, param,

                                DynamicAudiobufferSizeCompleteCallback);

      bluetooth::shim::GetController()->SetDabAudioBufferTime(

          firmware_tx_buffer_length_byte);

    }

  }

system/test/mock/mock_btif_core.cc

+0 −3
Original line number Diff line number Diff line
@@ -79,9 +79,6 @@ tBTA_SERVICE_MASK btif_get_enabled_services_mask(void) { 
  inc_func_call_count(__func__);

  return 0;

}

void DynamicAudiobufferSizeCompleteCallback(tBTM_VSC_CMPL* p_vsc_cmpl_params) {

  inc_func_call_count(__func__);

}

void btif_adapter_properties_evt(bt_status_t status, uint32_t num_props,

                                 bt_property_t* p_props) {

  inc_func_call_count(__func__);