• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythongamewindowsbathyscaphephpguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

system/bt


Commit MetaInfo

Revision61578191af535415104b2b1a5c9b9691430d289a (tree)
Zeit2017-06-30 17:29:57
AutorLinux Build Service Account <lnxbuild@loca...>
CommiterLinux Build Service Account

Log Message

Promotion of bt.lnx.2.1.c1-00059.

CRs Change ID Subject


2062337 I3ceea4f035a115985d692d30f39c3a0e4729a323 AV: Use separate AV sig timeout timer for dual connectio

Change-Id: I0b1df6756bec57a50812c07de2c9086aed68645d
CRs-Fixed: 2062337

Ändern Zusammenfassung

Diff

--- a/bta/av/bta_av_aact.c
+++ b/bta/av/bta_av_aact.c
@@ -1283,7 +1283,8 @@ void bta_av_config_ind (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
12831283 APPL_TRACE_WARNING(" bta_av_config_ind config_ind called before Open");
12841284 p_scb->coll_mask |= BTA_AV_COLL_SETCONFIG_IND;
12851285 }
1286- alarm_cancel(bta_av_cb.accept_signalling_timer);
1286+ APPL_TRACE_DEBUG(" bta_av_config_ind p_scb->hdi = %d ", p_scb->hdi);
1287+ alarm_cancel(bta_av_cb.accept_signalling_timer[p_scb->hdi]);
12871288
12881289 /* if no codec parameters in configuration, fail */
12891290 if ((p_evt_cfg->num_codec == 0) ||
--- a/bta/av/bta_av_act.c
+++ b/bta/av/bta_av_act.c
@@ -1547,12 +1547,12 @@ void bta_av_disable(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
15471547 {
15481548 hdr.layer_specific = xx + 1;
15491549 bta_av_api_deregister((tBTA_AV_DATA *)&hdr);
1550+ alarm_free(p_cb->accept_signalling_timer[xx]);
1551+ p_cb->accept_signalling_timer[xx] = NULL;
15501552 }
15511553
15521554 alarm_free(p_cb->link_signalling_timer);
15531555 p_cb->link_signalling_timer = NULL;
1554- alarm_free(p_cb->accept_signalling_timer);
1555- p_cb->accept_signalling_timer = NULL;
15561556 }
15571557
15581558 /*******************************************************************************
@@ -1667,7 +1667,7 @@ void bta_av_sig_chg(tBTA_AV_DATA *p_data)
16671667 p_cb->p_scb[xx]->peer_addr);
16681668 /* Possible collision : need to avoid outgoing processing while the timer is running */
16691669 p_cb->p_scb[xx]->coll_mask = BTA_AV_COLL_INC_TMR;
1670- alarm_set_on_queue(p_cb->accept_signalling_timer,
1670+ alarm_set_on_queue(p_cb->accept_signalling_timer[xx],
16711671 BTA_AV_ACCEPT_SIGNALLING_TIMEOUT_MS,
16721672 bta_av_accept_signalling_timer_cback,
16731673 UINT_TO_PTR(xx),
@@ -1806,7 +1806,7 @@ static void bta_av_accept_signalling_timer_cback(void *data)
18061806 /* We are still doing SDP. Run the timer again. */
18071807 p_scb->coll_mask |= BTA_AV_COLL_INC_TMR;
18081808
1809- alarm_set_on_queue(p_cb->accept_signalling_timer,
1809+ alarm_set_on_queue(p_cb->accept_signalling_timer[inx],
18101810 BTA_AV_ACCEPT_SIGNALLING_TIMEOUT_MS,
18111811 bta_av_accept_signalling_timer_cback,
18121812 UINT_TO_PTR(inx),
--- a/bta/av/bta_av_int.h
+++ b/bta/av/bta_av_int.h
@@ -606,7 +606,7 @@ typedef struct
606606 tBTA_AV_RCB rcb[BTA_AV_NUM_RCB]; /* RCB control block */
607607 tBTA_AV_LCB lcb[BTA_AV_NUM_LINKS+1]; /* link control block */
608608 alarm_t *link_signalling_timer;
609- alarm_t *accept_signalling_timer; /* timer to monitor signalling when accepting */
609+ alarm_t *accept_signalling_timer[BTA_AV_NUM_STRS]; /* timer to monitor signalling when accepting */
610610 UINT32 sdp_a2d_handle; /* SDP record handle for audio src */
611611 #if (BTA_AV_SINK_INCLUDED == TRUE)
612612 UINT32 sdp_a2d_snk_handle; /* SDP record handle for audio snk */
--- a/bta/av/bta_av_main.c
+++ b/bta/av/bta_av_main.c
@@ -256,8 +256,11 @@ static void bta_av_api_enable(tBTA_AV_DATA *p_data)
256256 * to alarm_free() the alarms below.
257257 */
258258 bta_av_cb.link_signalling_timer = alarm_new("bta_av.link_signalling_timer");
259- bta_av_cb.accept_signalling_timer =
260- alarm_new("bta_av.accept_signalling_timer");
259+ for (int j = 0; j < BTA_AV_NUM_STRS; j++)
260+ {
261+ bta_av_cb.accept_signalling_timer[j] =
262+ alarm_new("bta_av.accept_signalling_timer");
263+ }
261264
262265 /* store parameters */
263266 bta_av_cb.p_cback = p_data->api_enable.p_cback;