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

Commit ee587cf3 authored by Himanshu Rawat's avatar Himanshu Rawat
Browse files

Consume headtracking data in HOGP 

Register as headtracking data consumer and process it as input report.

Test: mmm packages/modules/Bluetooth
Test: Manual | LE audio streaming with device supporting DSA

Bug: 304840978
Bug: 309665975
Change-Id: I963263cc3a3ec5bec33988f389f1498be2310e40
parent a381f571

system/bta/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -1227,6 +1227,7 @@ cc_test { 
        ":TestCommonMainHandler",

        ":TestCommonMainHandler",

        ":TestCommonMockFunctions",

        ":TestCommonMockFunctions",

        ":TestMockBtaGatt",

        ":TestMockBtaGatt",

        ":TestMockBtaLeAudio",

        ":TestMockBtaSdp",

        ":TestMockBtaSdp",

        ":TestMockBtaSys",

        ":TestMockBtaSys",

        ":TestMockBtif",

        ":TestMockBtif",

system/bta/hh/bta_hh_le.cc

+33 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 




#define LOG_TAG "ble_bta_hh"

#define LOG_TAG "ble_bta_hh"





#include <android_bluetooth_flags.h>

#include <base/functional/bind.h>

#include <base/functional/bind.h>

#include <base/functional/callback.h>

#include <base/functional/callback.h>
@@ -27,6 +28,7 @@ 
#include "bta/hh/bta_hh_int.h"

#include "bta/hh/bta_hh_int.h"

#include "bta/include/bta_gatt_queue.h"

#include "bta/include/bta_gatt_queue.h"

#include "bta/include/bta_hh_co.h"

#include "bta/include/bta_hh_co.h"

#include "bta/include/bta_le_audio_api.h"

#include "device/include/interop.h"

#include "device/include/interop.h"

#include "os/log.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/allocator.h"
@@ -79,6 +81,9 @@ static void bta_hh_le_add_dev_bg_conn(tBTA_HH_DEV_CB* p_cb); 
static void bta_hh_process_cache_rpt(tBTA_HH_DEV_CB* p_cb,

static void bta_hh_process_cache_rpt(tBTA_HH_DEV_CB* p_cb,

                                     tBTA_HH_RPT_CACHE_ENTRY* p_rpt_cache,

                                     tBTA_HH_RPT_CACHE_ENTRY* p_rpt_cache,

                                     uint8_t num_rpt);

                                     uint8_t num_rpt);

static bool bta_hh_le_iso_data_callback(const RawAddress& addr,

                                        uint16_t cis_conn_hdl, uint8_t* data,

                                        uint16_t size, uint32_t timestamp);





static const char* bta_hh_le_rpt_name[4] = {"UNKNOWN", "INPUT", "OUTPUT",

static const char* bta_hh_le_rpt_name[4] = {"UNKNOWN", "INPUT", "OUTPUT",

                                            "FEATURE"};

                                            "FEATURE"};
@@ -196,6 +201,10 @@ void bta_hh_le_enable(void) { 
                            (*bta_hh_cb.p_cback)(BTA_HH_ENABLE_EVT, &bta_hh);

                            (*bta_hh_cb.p_cback)(BTA_HH_ENABLE_EVT, &bta_hh);

                          }

                          }

                        }), false);

                        }), false);



  if (IS_FLAG_ENABLED(leaudio_dynamic_spatial_audio)) {

    LeAudioClient::RegisterIsoDataConsumer(bta_hh_le_iso_data_callback);

  }

}

}





/*******************************************************************************

/*******************************************************************************
@@ -2270,3 +2279,27 @@ static void bta_hh_process_cache_rpt(tBTA_HH_DEV_CB* p_cb, 
    }

    }

  }

  }

}

}



static bool bta_hh_le_iso_data_callback(const RawAddress& addr,

                                        uint16_t cis_conn_hdl, uint8_t* data,

                                        uint16_t size, uint32_t timestamp) {

  if (!IS_FLAG_ENABLED(leaudio_dynamic_spatial_audio)) {

    LOG_WARN("DSA not supported");

    return false;

  }



  tAclLinkSpec link_spec{};

  link_spec.addrt.bda = addr;

  link_spec.transport = BT_TRANSPORT_LE;



  tBTA_HH_DEV_CB* p_dev_cb = bta_hh_le_find_dev_cb_by_bda(link_spec);

  if (p_dev_cb == nullptr) {

    LOG_WARN("Device not connected: %s", ADDRESS_TO_LOGGABLE_CSTR(link_spec));

    return false;

  }



  bta_hh_co_data(p_dev_cb->hid_handle, data, size, p_dev_cb->mode, 0,

                 p_dev_cb->dscp_info.ctry_code, p_dev_cb->link_spec,

                 BTA_HH_APP_ID_LE);

  return true;

}

system/bta/test/bta_hh_test.cc

+0 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "test/common/mock_functions.h"

#include "test/common/mock_functions.h"

#include "test/mock/mock_osi_allocator.h"

#include "test/mock/mock_osi_allocator.h"





bool LeAudioClient::IsLeAudioClientInStreaming() { return false; }

namespace {

namespace {

std::array<uint8_t, 32> data32 = {

std::array<uint8_t, 32> data32 = {

    0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,

    0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,