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

Commit cbca2c15 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

AVDT MTU is fixed am: c7ee1971 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1438053

Change-Id: Ib7dd455bf705071c82f31e3ebb51aa0b26ef047d
parents 0c357cad c7ee1971

system/bta/av/bta_av_cfg.cc

+0 −6
Original line number Diff line number Diff line
@@ -129,8 +129,6 @@ const tBTA_AV_CFG bta_av_cfg = { 
    BTA_AV_RC_COMP_ID,     /* AVRCP Company ID */

    BTA_AV_RC_SUPF_CT,     /* AVRCP controller categories */

    BTA_AV_RC_SUPF_TG,     /* AVRCP target categories */

    672,                   /* AVDTP signaling channel MTU at L2CAP */

    MAX_3MBPS_AVDTP_MTU,   /* AVDTP audio transport channel MTU at L2CAP */

    bta_av_audio_flush_to, /* AVDTP audio transport channel flush

                              timeout */

    6,                     /* AVDTP audio channel max data queue size */
@@ -153,8 +151,6 @@ const tBTA_AV_CFG bta_avk_cfg = { 
    AVRC_CO_METADATA,      /* AVRCP Company ID */

    BTA_AVK_RC_SUPF_CT,    /* AVRCP controller categories */

    BTA_AVK_RC_SUPF_TG,    /* AVRCP target categories */

    672,                   /* AVDTP signaling channel MTU at L2CAP */

    MAX_3MBPS_AVDTP_MTU,   /* AVDTP audio transport channel MTU at L2CAP */

    bta_av_audio_flush_to, /* AVDTP audio transport channel flush timeout */

    6,                     /* AVDTP audio channel max data queue size */

    false, /* true, to accept AVRC 1.3 group nevigation command */
@@ -175,8 +171,6 @@ const tBTA_AV_CFG bta_av_cfg_compatibility = { 
    BTA_AV_RC_COMP_ID,     /* AVRCP Company ID */

    BTA_AV_RC_SUPF_CT,     /* AVRCP controller categories */

    AVRC_SUPF_TG_CAT1,     /* Only support CAT1 for AVRCP1.3 */

    672,                   /* AVDTP signaling channel MTU at L2CAP */

    MAX_3MBPS_AVDTP_MTU,   /* AVDTP audio transport channel MTU at L2CAP */

    bta_av_audio_flush_to, /* AVDTP audio transport channel flush timeout */

    6,                     /* AVDTP audio channel max data queue size */

    false, /* true, to accept AVRC 1.3 group nevigation command */

system/bta/av/bta_av_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 


    if (bta_av_cb.reg_audio == 0) {

      /* the first channel registered. register to AVDTP */

      reg.ctrl_mtu = p_bta_av_cfg->sig_mtu;

      reg.ctrl_mtu = 672;

      reg.ret_tout = BTA_AV_RET_TOUT;

      reg.sig_tout = BTA_AV_SIG_TOUT;

      reg.idle_tout = BTA_AV_IDLE_TOUT;
@@ -532,7 +532,7 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
    p_scb->media_type = AVDT_MEDIA_TYPE_AUDIO;

    avdtp_stream_config.cfg.psc_mask = AVDT_PSC_TRANS;

    avdtp_stream_config.media_type = AVDT_MEDIA_TYPE_AUDIO;

    avdtp_stream_config.mtu = p_bta_av_cfg->audio_mtu;

    avdtp_stream_config.mtu = MAX_3MBPS_AVDTP_MTU;

    avdtp_stream_config.flush_to = L2CAP_DEFAULT_FLUSH_TO;

    btav_a2dp_codec_index_t codec_index_min = BTAV_A2DP_CODEC_INDEX_SOURCE_MIN;

    btav_a2dp_codec_index_t codec_index_max = BTAV_A2DP_CODEC_INDEX_SOURCE_MAX;

system/bta/include/bta_av_api.h

+0 −2
Original line number Diff line number Diff line
@@ -378,8 +378,6 @@ typedef struct { 
  uint32_t company_id;  /* AVRCP Company ID */

  uint16_t avrc_ct_cat; /* AVRCP controller categories */

  uint16_t avrc_tg_cat; /* AVRCP target categories */

  uint16_t sig_mtu;     /* AVDTP signaling channel MTU at L2CAP */

  uint16_t audio_mtu;   /* AVDTP audio transport channel MTU at L2CAP */

  const uint16_t*

      p_audio_flush_to;    /* AVDTP audio transport channel flush timeout */

  uint16_t audio_mqs;      /* AVDTP audio channel max data queue size */

system/stack/avdt/avdt_ad.cc

+2 −2
Original line number Diff line number Diff line
@@ -527,11 +527,11 @@ void avdt_ad_open_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb, 


  if (type == AVDT_CHAN_SIG) {

    /* if signaling, get mtu from registration control block */

    p_tbl->my_mtu = avdtp_cb.rcb.ctrl_mtu;

    p_tbl->my_mtu = kSignalMtu;

    p_tbl->my_flush_to = L2CAP_DEFAULT_FLUSH_TO;

  } else {

    /* otherwise get mtu from scb */

    p_tbl->my_mtu = p_scb->stream_config.mtu;

    p_tbl->my_mtu = kAudioMtu;

    p_tbl->my_flush_to = p_scb->stream_config.flush_to;



    /* also set scb_hdl in rt_tbl */

system/stack/avdt/avdt_int.h

+3 −0
Original line number Diff line number Diff line
@@ -1005,4 +1005,7 @@ extern const uint8_t avdt_msg_rej_2_evt[]; 


void avdt_l2c_disconnect(uint16_t lcid);



constexpr uint16_t kSignalMtu = 672;

constexpr uint16_t kAudioMtu = MAX_3MBPS_AVDTP_MTU;



#endif /* AVDT_INT_H */