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

Commit 76e50d42 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Move BTM_VOICE_SETTING from header to source am: e210da03 

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



Change-Id: Ifb165a1120873d7861ed45ef9f950cdc175827e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ecd26f92 e210da03

system/bta/ag/bta_ag_sco.cc

+8 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,14 @@ extern tBTM_CB btm_cb; 
#define BTA_AG_CODEC_NEGOTIATION_TIMEOUT_MS (3 * 1000) /* 3 seconds */

#define BTA_AG_CODEC_NEGOTIATION_TIMEOUT_MS (3 * 1000) /* 3 seconds */

#endif

#endif





#define BTM_VOICE_SETTING_CVSD                                         \

  ((uint16_t)(HCI_INP_CODING_LINEAR | HCI_INP_DATA_FMT_2S_COMPLEMENT | \

              HCI_INP_SAMPLE_SIZE_16BIT | HCI_AIR_CODING_FORMAT_CVSD))



#define BTM_VOICE_SETTING_TRANS                                        \

  ((uint16_t)(HCI_INP_CODING_LINEAR | HCI_INP_DATA_FMT_2S_COMPLEMENT | \

              HCI_INP_SAMPLE_SIZE_16BIT | HCI_AIR_CODING_FORMAT_TRANSPNT))



static bool sco_allowed = true;

static bool sco_allowed = true;

static RawAddress active_device_addr = {};

static RawAddress active_device_addr = {};

system/stack/include/btm_api_types.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -178,13 +178,6 @@ typedef uint16_t tBTM_SCO_CODEC_TYPE; 
/*******************

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

 * SCO Voice Settings

 * SCO Voice Settings

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

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

#define BTM_VOICE_SETTING_CVSD                                         \

  ((uint16_t)(HCI_INP_CODING_LINEAR | HCI_INP_DATA_FMT_2S_COMPLEMENT | \

              HCI_INP_SAMPLE_SIZE_16BIT | HCI_AIR_CODING_FORMAT_CVSD))



#define BTM_VOICE_SETTING_TRANS                                        \

  ((uint16_t)(HCI_INP_CODING_LINEAR | HCI_INP_DATA_FMT_2S_COMPLEMENT | \

              HCI_INP_SAMPLE_SIZE_16BIT | HCI_AIR_CODING_FORMAT_TRANSPNT))





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

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

 * SCO Data Status

 * SCO Data Status