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

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

BTA_AV: Simplify flush timeout parameter am: 96b7fe83 am: 4db94d9c am:... 

BTA_AV: Simplify flush timeout parameter am: 96b7fe83 am: 4db94d9c am: 8cbc6f28 am: 6b035778

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

Change-Id: Id1fb3453ce76b23e3d41cefb44d8d2e4bd35539b
parents 098c4159 6b035778

system/bta/av/bta_av_aact.cc

+2 −7
Original line number Diff line number Diff line
@@ -2164,7 +2164,6 @@ void bta_av_data_path(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) { 
void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {

  bool initiator = false;

  bool suspend = false;

  uint16_t flush_to;

  uint8_t new_role = p_scb->role;

  BT_HDR hdr;

  uint8_t cur_role;
@@ -2273,11 +2272,9 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
     * to be changed

     */

    p_scb->co_started = bta_av_cb.audio_open_cnt;

    flush_to = p_bta_av_cfg->p_audio_flush_to[p_scb->co_started - 1];

  } else {

    flush_to = 0;

  }

  L2CA_SetFlushTimeout(p_scb->PeerAddress(), flush_to);

  L2CA_SetFlushTimeout(p_scb->PeerAddress(), 0);



  /* clear the congestion flag */

  p_scb->cong = false;
@@ -2877,9 +2874,7 @@ void bta_av_chk_2nd_start(tBTA_AV_SCB* p_scb, 
          // May need to update the flush timeout of this already started stream

          if (p_scbi->co_started != bta_av_cb.audio_open_cnt) {

            p_scbi->co_started = bta_av_cb.audio_open_cnt;

            L2CA_SetFlushTimeout(

                p_scbi->PeerAddress(),

                p_bta_av_cfg->p_audio_flush_to[p_scbi->co_started - 1]);

            L2CA_SetFlushTimeout(p_scbi->PeerAddress(), 0);

          }

        }

      }

system/bta/av/bta_av_act.cc

+1 −3
Original line number Diff line number Diff line
@@ -1280,9 +1280,7 @@ void bta_av_conn_chg(tBTA_AV_DATA* p_data) { 
           */

          if (p_scbi->co_started != bta_av_cb.audio_open_cnt) {

            p_scbi->co_started = bta_av_cb.audio_open_cnt;

            L2CA_SetFlushTimeout(

                p_scbi->PeerAddress(),

                p_bta_av_cfg->p_audio_flush_to[p_scbi->co_started - 1]);

            L2CA_SetFlushTimeout(p_scbi->PeerAddress(), 0);

          }

        }

      }

system/bta/av/bta_av_cfg.cc

+0 −13
Original line number Diff line number Diff line
@@ -63,15 +63,6 @@ const uint32_t bta_av_meta_caps_co_ids[] = {AVRC_CO_METADATA, AVRC_CO_BROADCOM}; 
 *	3. GetCapabilities supported event_ids list

 *	4. GetCapabilities supported event_ids count

*/

/* Flushing partial avdtp packets can cause some headsets to disconnect the link

   if receiving partial a2dp frames */

const uint16_t bta_av_audio_flush_to[] = {

    0, /* 1 stream */

    0, /* 2 streams */

    0, /* 3 streams */

    0, /* 4 streams */

    0  /* 5 streams */

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



/* Note: Android doesnt support AVRC_SUPF_TG_GROUP_NAVI  */

/* Note: if AVRC_SUPF_TG_GROUP_NAVI is set, bta_av_cfg.avrc_group should be true
@@ -129,8 +120,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 */

    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 */

    2,     /* company id count in p_meta_co_ids */
@@ -151,7 +140,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 */

    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 */

    2,     /* company id count in p_meta_co_ids */
@@ -171,7 +159,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 */

    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 */

    2,     /* company id count in p_meta_co_ids */

system/bta/av/bta_av_main.cc

+1 −3
Original line number Diff line number Diff line
@@ -757,9 +757,7 @@ bool bta_av_chk_start(tBTA_AV_SCB* p_scb) { 
        // May need to update the flush timeout of this already started stream

        if (p_scbi->co_started != bta_av_cb.audio_open_cnt) {

          p_scbi->co_started = bta_av_cb.audio_open_cnt;

          L2CA_SetFlushTimeout(

              p_scbi->PeerAddress(),

              p_bta_av_cfg->p_audio_flush_to[p_scbi->co_started - 1]);

          L2CA_SetFlushTimeout(p_scbi->PeerAddress(), 0);

        }

      }

    }

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 */

  const uint16_t*

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

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

  bool avrc_group;     /* true, to accept AVRC 1.3 group nevigation command */

  uint8_t num_co_ids;  /* company id count in p_meta_co_ids */