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

Commit 99d2e38e authored by Chris Manton's avatar Chris Manton
Browse files

legacy: Replace BTA_AG_CODEC_MSBC => BTM_SCO_CODEC_MSBC 

Bug: 163134718
Tag: #refactor
Test: gd/cert/run

Change-Id: Ic5f741370a3adba9f065d68c42323c16daf07097
parent 69c41d84

system/bta/ag/bta_ag_act.cc

+3 −2
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
      bool sdp_wbs_support = p_scb->peer_sdp_features & BTA_AG_FEAT_WBS_SUPPORT;

      if (!p_scb->received_at_bac && sdp_wbs_support) {

        p_scb->codec_updated = true;

        p_scb->peer_codecs = BTM_SCO_CODEC_CVSD & BTA_AG_CODEC_MSBC;

        p_scb->peer_codecs = BTM_SCO_CODEC_CVSD & BTM_SCO_CODEC_MSBC;

        p_scb->sco_codec = UUID_CODEC_MSBC;

      }

    } else {
@@ -802,7 +802,8 @@ void bta_ag_setcodec(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 


  /* Check if the requested codec type is valid */

  if ((codec_type != BTM_SCO_CODEC_NONE) &&

      (codec_type != BTM_SCO_CODEC_CVSD) && (codec_type != BTA_AG_CODEC_MSBC)) {

      (codec_type != BTM_SCO_CODEC_CVSD) &&

      (codec_type != BTM_SCO_CODEC_MSBC)) {

    val.num = codec_type;

    val.hdr.status = BTA_AG_FAIL_RESOURCES;

    APPL_TRACE_ERROR("bta_ag_setcodec error: unsupported codec type %d",

system/bta/ag/bta_ag_cmd.cc

+4 −4
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ static tBTA_AG_PEER_CODEC bta_ag_parse_bac(tBTA_AG_SCB* p_scb, char* p_s, 
        retval |= BTM_SCO_CODEC_CVSD;

        break;

      case UUID_CODEC_MSBC:

        retval |= BTA_AG_CODEC_MSBC;

        retval |= BTM_SCO_CODEC_MSBC;

        break;

      default:

        APPL_TRACE_ERROR("Unknown Codec UUID(%d) received", uuid_codec);
@@ -1249,7 +1249,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
        p_scb->peer_codecs = bta_ag_parse_bac(p_scb, p_arg, p_end);

        p_scb->codec_updated = true;



        if (p_scb->peer_codecs & BTA_AG_CODEC_MSBC) {

        if (p_scb->peer_codecs & BTM_SCO_CODEC_MSBC) {

          p_scb->sco_codec = UUID_CODEC_MSBC;

          APPL_TRACE_DEBUG("Received AT+BAC, updating sco codec to MSBC");

        } else {
@@ -1285,7 +1285,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
          codec_type = BTM_SCO_CODEC_CVSD;

          break;

        case UUID_CODEC_MSBC:

          codec_type = BTA_AG_CODEC_MSBC;

          codec_type = BTM_SCO_CODEC_MSBC;

          break;

        default:

          APPL_TRACE_ERROR("Unknown codec_uuid %d", int_arg);
@@ -1773,7 +1773,7 @@ void bta_ag_send_bcs(tBTA_AG_SCB* p_scb) { 
      case BTM_SCO_CODEC_CVSD:

        codec_uuid = UUID_CODEC_CVSD;

        break;

      case BTA_AG_CODEC_MSBC:

      case BTM_SCO_CODEC_MSBC:

        codec_uuid = UUID_CODEC_MSBC;

        break;

      default:

system/bta/ag/bta_ag_sco.cc

+6 −6
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) { 


  if (handle != 0) {

    /* Restore settings */

    if (bta_ag_cb.sco.p_curr_scb->inuse_codec == BTA_AG_CODEC_MSBC) {

    if (bta_ag_cb.sco.p_curr_scb->inuse_codec == BTM_SCO_CODEC_MSBC) {

      /* Bypass vendor specific and voice settings if enhanced eSCO supported */

      if (!(controller_get_interface()

                ->supports_enhanced_setup_synchronous_connection())) {
@@ -373,8 +373,8 @@ static void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) { 
  }



#if (DISABLE_WBS == FALSE)

  if ((p_scb->sco_codec == BTA_AG_CODEC_MSBC) && !p_scb->codec_fallback)

    esco_codec = BTA_AG_CODEC_MSBC;

  if ((p_scb->sco_codec == BTM_SCO_CODEC_MSBC) && !p_scb->codec_fallback)

    esco_codec = BTM_SCO_CODEC_MSBC;

#endif



  if (p_scb->codec_fallback) {
@@ -389,7 +389,7 @@ static void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) { 
  enh_esco_params_t params = {};

  /* If WBS included, use CVSD by default, index is 0 for CVSD by

   * initialization. If eSCO codec is mSBC, index is T2 or T1 */

  if (esco_codec == BTA_AG_CODEC_MSBC) {

  if (esco_codec == BTM_SCO_CODEC_MSBC) {

    if (p_scb->codec_msbc_settings == BTA_AG_SCO_MSBC_SETTINGS_T2) {

      params = esco_parameters_for_codec(ESCO_CODEC_MSBC_T2);

    } else {
@@ -457,7 +457,7 @@ static void bta_ag_create_pending_sco(tBTA_AG_SCB* p_scb, bool is_local) { 


  /* Local device requested SCO connection to peer */

  if (is_local) {

    if (esco_codec == BTA_AG_CODEC_MSBC) {

    if (esco_codec == BTM_SCO_CODEC_MSBC) {

      if (p_scb->codec_msbc_settings == BTA_AG_SCO_MSBC_SETTINGS_T2) {

        params = esco_parameters_for_codec(ESCO_CODEC_MSBC_T2);

      } else {
@@ -477,7 +477,7 @@ static void bta_ag_create_pending_sco(tBTA_AG_SCB* p_scb, bool is_local) { 
    /* Bypass voice settings if enhanced SCO setup command is supported */

    if (!(controller_get_interface()

              ->supports_enhanced_setup_synchronous_connection())) {

      if (esco_codec == BTA_AG_CODEC_MSBC) {

      if (esco_codec == BTM_SCO_CODEC_MSBC) {

        BTM_WriteVoiceSettings(BTM_VOICE_SETTING_TRANS);

      } else {

        BTM_WriteVoiceSettings(BTM_VOICE_SETTING_CVSD);

system/bta/ag/bta_ag_sdp.cc

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { 
          // 2. But do not send required AT+BAC command

          // Will assume mSBC is enabled and try codec negotiation by default

          p_scb->codec_updated = true;

          p_scb->peer_codecs = BTM_SCO_CODEC_CVSD & BTA_AG_CODEC_MSBC;

          p_scb->peer_codecs = BTM_SCO_CODEC_CVSD & BTM_SCO_CODEC_MSBC;

          p_scb->sco_codec = UUID_CODEC_MSBC;

        }

        if (sdp_features != p_scb->peer_sdp_features) {

system/bta/hf_client/bta_hf_client_sco.cc

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void bta_hf_client_sco_conn_rsp(tBTA_HF_CLIENT_CB* client_cb, 
    if (p_data->link_type == BTM_LINK_TYPE_SCO) {

      // SCO

      resp = esco_parameters_for_codec(SCO_CODEC_CVSD_D1);

    } else if (client_cb->negotiated_codec == BTA_AG_CODEC_MSBC) {

    } else if (client_cb->negotiated_codec == BTM_SCO_CODEC_MSBC) {

      // eSCO mSBC

      resp = esco_parameters_for_codec(ESCO_CODEC_MSBC_T2);

    } else if (bta_hf_client_cb_arr.features & BTA_HF_CLIENT_FEAT_ESCO_S4) {