A2DP Codec related cleanup (1fdab550) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/av/bta_av_aact.cc

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1081,7 +1081,7 @@ void bta_av_free_sdb(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_av_config_ind(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {		void bta_av_config_ind(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
	tBTA_AV_CI_SETCONFIG setconfig;		tBTA_AV_CI_SETCONFIG setconfig;
	tAVDT_SEP_INFO* p_info;		tAVDT_SEP_INFO* p_info;
	tAVDT_CFG* p_evt_cfg = &p_data->str_msg.cfg;		tAVDT_CFG* p_evt_cfg = &p_data->str_msg.cfg;
	@@ -1337,7 +1337,7 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
	memset(&p_scb->q_info, 0, sizeof(tBTA_AV_Q_INFO));		memset(&p_scb->q_info, 0, sizeof(tBTA_AV_Q_INFO));

	p_scb->l2c_bufs = 0;		p_scb->l2c_bufs = 0;
	p_scb->p_cos->open(p_scb->hndl, p_scb->cfg.codec_info, mtu);		p_scb->p_cos->open(p_scb->hndl, mtu);

	{		{
	/* TODO check if other audio channel is open.		/* TODO check if other audio channel is open.
	@@ -1674,7 +1674,7 @@ void bta_av_cco_close(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {

	mtu = bta_av_chk_mtu(p_scb, BTA_AV_MAX_A2DP_MTU);		mtu = bta_av_chk_mtu(p_scb, BTA_AV_MAX_A2DP_MTU);

	p_scb->p_cos->close(p_scb->hndl, mtu);		p_scb->p_cos->close(p_scb->hndl);
	}		}

	/*******************************************************************************		/*******************************************************************************
	@@ -2339,7 +2339,6 @@ void bta_av_start_failed(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {
	void bta_av_str_closed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {		void bta_av_str_closed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
	tBTA_AV data;		tBTA_AV data;
	tBTA_AV_EVT event;		tBTA_AV_EVT event;
	uint16_t mtu;
	uint8_t policy = HCI_ENABLE_SNIFF_MODE;		uint8_t policy = HCI_ENABLE_SNIFF_MODE;

	if ((bta_av_cb.features & BTA_AV_FEAT_MASTER) == 0 \|\|		if ((bta_av_cb.features & BTA_AV_FEAT_MASTER) == 0 \|\|
	@@ -2375,11 +2374,8 @@ void bta_av_str_closed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
	bta_av_str_stopped(p_scb, NULL);		bta_av_str_stopped(p_scb, NULL);
	}		}

	/* Update common mtu shared by remaining connectons */
	mtu = bta_av_chk_mtu(p_scb, BTA_AV_MAX_A2DP_MTU);

	{		{
	p_scb->p_cos->close(p_scb->hndl, mtu);		p_scb->p_cos->close(p_scb->hndl);
	data.close.chnl = p_scb->chnl;		data.close.chnl = p_scb->chnl;
	data.close.hndl = p_scb->hndl;		data.close.hndl = p_scb->hndl;
	event = BTA_AV_CLOSE_EVT;		event = BTA_AV_CLOSE_EVT;

system/bta/av/bta_av_int.h

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,6 @@
	#include "osi/include/list.h"		#include "osi/include/list.h"
	#include "stack/include/a2dp_api.h"		#include "stack/include/a2dp_api.h"

	#define BTA_AV_DEBUG TRUE
	/*****************************************************************************		/*****************************************************************************
	* Constants		* Constants
	****************************************************************************/		****************************************************************************/
	@@ -171,11 +170,10 @@ typedef tA2DP_STATUS (*tBTA_AV_CO_GETCFG)(tBTA_AV_HNDL hndl,
	typedef void (*tBTA_AV_CO_SETCFG)(tBTA_AV_HNDL hndl,		typedef void (*tBTA_AV_CO_SETCFG)(tBTA_AV_HNDL hndl,
	const uint8_t* p_codec_info, uint8_t seid,		const uint8_t* p_codec_info, uint8_t seid,
	BD_ADDR addr, uint8_t num_protect,		BD_ADDR addr, uint8_t num_protect,
	uint8_t* p_protect_info, uint8_t t_local_sep,		const uint8_t* p_protect_info,
	uint8_t avdt_handle);		uint8_t t_local_sep, uint8_t avdt_handle);
	typedef void (tBTA_AV_CO_OPEN)(tBTA_AV_HNDL hndl, uint8_t p_codec_info,		typedef void (*tBTA_AV_CO_OPEN)(tBTA_AV_HNDL hndl, uint16_t mtu);
	uint16_t mtu);		typedef void (*tBTA_AV_CO_CLOSE)(tBTA_AV_HNDL hndl);
	typedef void (*tBTA_AV_CO_CLOSE)(tBTA_AV_HNDL hndl, uint16_t mtu);
	typedef void (tBTA_AV_CO_START)(tBTA_AV_HNDL hndl, uint8_t p_codec_info,		typedef void (tBTA_AV_CO_START)(tBTA_AV_HNDL hndl, uint8_t p_codec_info,
	bool* p_no_rtp_hdr);		bool* p_no_rtp_hdr);
	typedef void (*tBTA_AV_CO_STOP)(tBTA_AV_HNDL hndl);		typedef void (*tBTA_AV_CO_STOP)(tBTA_AV_HNDL hndl);
	@@ -613,9 +611,7 @@ extern void bta_av_sm_execute(tBTA_AV_CB* p_cb, uint16_t event,
	extern void bta_av_ssm_execute(tBTA_AV_SCB* p_scb, uint16_t event,		extern void bta_av_ssm_execute(tBTA_AV_SCB* p_scb, uint16_t event,
	tBTA_AV_DATA* p_data);		tBTA_AV_DATA* p_data);
	extern bool bta_av_hdl_event(BT_HDR* p_msg);		extern bool bta_av_hdl_event(BT_HDR* p_msg);
	#if (BTA_AV_DEBUG == TRUE)
	extern const char* bta_av_evt_code(uint16_t evt_code);		extern const char* bta_av_evt_code(uint16_t evt_code);
	#endif
	extern bool bta_av_switch_if_needed(tBTA_AV_SCB* p_scb);		extern bool bta_av_switch_if_needed(tBTA_AV_SCB* p_scb);
	extern bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits);		extern bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits);
	extern bool bta_av_is_rcfg_sst(tBTA_AV_SCB* p_scb);		extern bool bta_av_is_rcfg_sst(tBTA_AV_SCB* p_scb);

system/bta/av/bta_av_main.cc

+9 −27

Original line number	Original line	Diff line number	Diff line
	@@ -183,9 +183,7 @@ const tBTA_AV_NSM_ACT bta_av_nsm_act[] = {
	/* AV control block */		/* AV control block */
	tBTA_AV_CB bta_av_cb;		tBTA_AV_CB bta_av_cb;

	#if (BTA_AV_DEBUG == TRUE)
	static const char* bta_av_st_code(uint8_t state);		static const char* bta_av_st_code(uint8_t state);
	#endif

	/*******************************************************************************		/*******************************************************************************
	*		*
	@@ -341,12 +339,12 @@ void bta_av_conn_cback(UNUSED_ATTR uint8_t handle, BD_ADDR bd_addr,
	#endif		#endif
	{		{
	evt = BTA_AV_SIG_CHG_EVT;		evt = BTA_AV_SIG_CHG_EVT;
	if (AVDT_DISCONNECT_IND_EVT == event) p_scb = bta_av_addr_to_scb(bd_addr);		if (event == AVDT_DISCONNECT_IND_EVT) {
	#if (BTA_AV_DEBUG == TRUE)		p_scb = bta_av_addr_to_scb(bd_addr);
	else if (AVDT_CONNECT_IND_EVT == event) {		} else if (event == AVDT_CONNECT_IND_EVT) {
	APPL_TRACE_DEBUG("CONN_IND is ACP:%d", p_data->hdr.err_param);		APPL_TRACE_DEBUG("%s: CONN_IND is ACP:%d", __func__,
			p_data->hdr.err_param);
	}		}
	#endif

	tBTA_AV_STR_MSG* p_msg =		tBTA_AV_STR_MSG* p_msg =
	(tBTA_AV_STR_MSG*)osi_malloc(sizeof(tBTA_AV_STR_MSG));		(tBTA_AV_STR_MSG*)osi_malloc(sizeof(tBTA_AV_STR_MSG));
	@@ -354,11 +352,9 @@ void bta_av_conn_cback(UNUSED_ATTR uint8_t handle, BD_ADDR bd_addr,
	p_msg->hdr.layer_specific = event;		p_msg->hdr.layer_specific = event;
	p_msg->hdr.offset = p_data->hdr.err_param;		p_msg->hdr.offset = p_data->hdr.err_param;
	bdcpy(p_msg->bd_addr, bd_addr);		bdcpy(p_msg->bd_addr, bd_addr);
	#if (BTA_AV_DEBUG == TRUE)
	if (p_scb) {		if (p_scb) {
	APPL_TRACE_DEBUG("scb hndl x%x, role x%x", p_scb->hndl, p_scb->role);		APPL_TRACE_DEBUG("scb hndl x%x, role x%x", p_scb->hndl, p_scb->role);
	}		}
	#endif
	APPL_TRACE_DEBUG("conn_cback bd_addr:%02x-%02x-%02x-%02x-%02x-%02x",		APPL_TRACE_DEBUG("conn_cback bd_addr:%02x-%02x-%02x-%02x-%02x-%02x",
	bd_addr[0], bd_addr[1], bd_addr[2], bd_addr[3], bd_addr[4],		bd_addr[0], bd_addr[1], bd_addr[2], bd_addr[3], bd_addr[4],
	bd_addr[5]);		bd_addr[5]);
	@@ -546,7 +542,7 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) {

	/* keep the configuration in the stream control block */		/* keep the configuration in the stream control block */
	memcpy(&p_scb->cfg, &cs.cfg, sizeof(tAVDT_CFG));		memcpy(&p_scb->cfg, &cs.cfg, sizeof(tAVDT_CFG));
	for (int i = 0; i < A2DP_CODEC_SEP_INDEX_MAX; i++) {		for (int i = codec_sep_index_min; i < codec_sep_index_max; i++) {
	tA2DP_CODEC_SEP_INDEX codec_sep_index =		tA2DP_CODEC_SEP_INDEX codec_sep_index =
	static_cast<tA2DP_CODEC_SEP_INDEX>(i);		static_cast<tA2DP_CODEC_SEP_INDEX>(i);
	if (!(*bta_av_a2dp_cos.init)(codec_sep_index, &cs.cfg)) {		if (!(*bta_av_a2dp_cos.init)(codec_sep_index, &cs.cfg)) {
	@@ -1102,13 +1098,9 @@ void bta_av_sm_execute(tBTA_AV_CB* p_cb, uint16_t event, tBTA_AV_DATA* p_data) {
	tBTA_AV_ST_TBL state_table;		tBTA_AV_ST_TBL state_table;
	uint8_t action;		uint8_t action;

	#if (BTA_AV_DEBUG == TRUE)		APPL_TRACE_EVENT("%s: AV event=0x%x(%s) state=%d(%s)", __func__, event,
	APPL_TRACE_EVENT("AV event=0x%x(%s) state=%d(%s)", event,
	bta_av_evt_code(event), p_cb->state,		bta_av_evt_code(event), p_cb->state,
	bta_av_st_code(p_cb->state));		bta_av_st_code(p_cb->state));
	#else
	APPL_TRACE_EVENT("AV event=0x%x state=%d", event, p_cb->state);
	#endif

	/* look up the state table for the current state */		/* look up the state table for the current state */
	state_table = bta_av_st_tbl[p_cb->state];		state_table = bta_av_st_tbl[p_cb->state];
	@@ -1142,23 +1134,15 @@ bool bta_av_hdl_event(BT_HDR* p_msg) {
	return true; /* to free p_msg */		return true; /* to free p_msg */
	}		}
	if (p_msg->event >= BTA_AV_FIRST_NSM_EVT) {		if (p_msg->event >= BTA_AV_FIRST_NSM_EVT) {
	#if (BTA_AV_DEBUG == TRUE)		APPL_TRACE_VERBOSE("%s: AV nsm event=0x%x(%s)", __func__, p_msg->event,
	APPL_TRACE_VERBOSE("AV nsm event=0x%x(%s)", p_msg->event,
	bta_av_evt_code(p_msg->event));		bta_av_evt_code(p_msg->event));
	#else
	APPL_TRACE_VERBOSE("AV nsm event=0x%x", p_msg->event);
	#endif
	/* non state machine events */		/* non state machine events */
	(*bta_av_nsm_act[p_msg->event - BTA_AV_FIRST_NSM_EVT])(		(*bta_av_nsm_act[p_msg->event - BTA_AV_FIRST_NSM_EVT])(
	(tBTA_AV_DATA*) p_msg);		(tBTA_AV_DATA*) p_msg);
	} else if (p_msg->event >= BTA_AV_FIRST_SM_EVT		} else if (p_msg->event >= BTA_AV_FIRST_SM_EVT
	&& p_msg->event <= BTA_AV_LAST_SM_EVT) {		&& p_msg->event <= BTA_AV_LAST_SM_EVT) {
	#if (BTA_AV_DEBUG == TRUE)		APPL_TRACE_VERBOSE("%s: AV sm event=0x%x(%s)", __func__, p_msg->event,
	APPL_TRACE_VERBOSE("AV sm event=0x%x(%s)", p_msg->event,
	bta_av_evt_code(p_msg->event));		bta_av_evt_code(p_msg->event));
	#else
	APPL_TRACE_VERBOSE("AV sm event=0x%x", p_msg->event);
	#endif
	/* state machine events */		/* state machine events */
	bta_av_sm_execute(&bta_av_cb, p_msg->event, (tBTA_AV_DATA*) p_msg);		bta_av_sm_execute(&bta_av_cb, p_msg->event, (tBTA_AV_DATA*) p_msg);
	} else {		} else {
	@@ -1173,7 +1157,6 @@ bool bta_av_hdl_event(BT_HDR* p_msg) {
	/*****************************************************************************		/*****************************************************************************
	* Debug Functions		* Debug Functions
	****************************************************************************/		****************************************************************************/
	#if (BTA_AV_DEBUG == TRUE)
	/*******************************************************************************		/*******************************************************************************
	*		*
	* Function bta_av_st_code		* Function bta_av_st_code
	@@ -1330,4 +1313,3 @@ const char* bta_av_evt_code(uint16_t evt_code) {
	return "unknown";		return "unknown";
	}		}
	}		}
	#endif /* BTA_AV_DEBUG */

system/bta/av/bta_av_ssm.cc

+2 −11

Original line number	Original line	Diff line number	Diff line
	@@ -466,9 +466,7 @@ static const tBTA_AV_SST_TBL bta_av_sst_tbl[] = {
	bta_av_sst_init, bta_av_sst_incoming, bta_av_sst_opening,		bta_av_sst_init, bta_av_sst_incoming, bta_av_sst_opening,
	bta_av_sst_open, bta_av_sst_rcfg, bta_av_sst_closing};		bta_av_sst_open, bta_av_sst_rcfg, bta_av_sst_closing};

	#if (BTA_AV_DEBUG == TRUE)
	static const char* bta_av_sst_code(uint8_t state);		static const char* bta_av_sst_code(uint8_t state);
	#endif

	/*******************************************************************************		/*******************************************************************************
	*		*
	@@ -530,13 +528,9 @@ void bta_av_ssm_execute(tBTA_AV_SCB* p_scb, uint16_t event,
	}		}
	}		}

	#if (BTA_AV_DEBUG == TRUE)		APPL_TRACE_VERBOSE("%s: AV Sevent(0x%x)=0x%x(%s) state=%d(%s)", __func__,
	APPL_TRACE_VERBOSE("AV Sevent(0x%x)=0x%x(%s) state=%d(%s)", p_scb->hndl,		p_scb->hndl, event, bta_av_evt_code(event), p_scb->state,
	event, bta_av_evt_code(event), p_scb->state,
	bta_av_sst_code(p_scb->state));		bta_av_sst_code(p_scb->state));
	#else
	APPL_TRACE_VERBOSE("AV Sevent=0x%x state=%d", event, p_scb->state);
	#endif

	/* look up the state table for the current state */		/* look up the state table for the current state */
	state_table = bta_av_sst_tbl[p_scb->state];		state_table = bta_av_sst_tbl[p_scb->state];
	@@ -651,7 +645,6 @@ void bta_av_set_scb_sst_incoming(tBTA_AV_SCB* p_scb) {
	/*****************************************************************************		/*****************************************************************************
	* Debug Functions		* Debug Functions
	****************************************************************************/		****************************************************************************/
	#if (BTA_AV_DEBUG == TRUE)
	/*******************************************************************************		/*******************************************************************************
	*		*
	* Function bta_av_sst_code		* Function bta_av_sst_code
	@@ -679,5 +672,3 @@ static const char* bta_av_sst_code(uint8_t state) {
	return "unknown";		return "unknown";
	}		}
	}		}

	#endif

system/bta/include/bta_av_co.h

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -98,8 +98,8 @@ tA2DP_STATUS bta_av_co_audio_getconfig(tBTA_AV_HNDL hndl, uint8_t* p_codec_info,
	******************************************************************************/		******************************************************************************/
	void bta_av_co_audio_setconfig(tBTA_AV_HNDL hndl, const uint8_t* p_codec_info,		void bta_av_co_audio_setconfig(tBTA_AV_HNDL hndl, const uint8_t* p_codec_info,
	uint8_t seid, BD_ADDR addr, uint8_t num_protect,		uint8_t seid, BD_ADDR addr, uint8_t num_protect,
	uint8_t* p_protect_info, uint8_t t_local_sep,		const uint8_t* p_protect_info,
	uint8_t avdt_handle);		uint8_t t_local_sep, uint8_t avdt_handle);

	/*******************************************************************************		/*******************************************************************************
	*		*
	@@ -114,8 +114,7 @@ void bta_av_co_audio_setconfig(tBTA_AV_HNDL hndl, const uint8_t* p_codec_info,
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_av_co_audio_open(tBTA_AV_HNDL hndl, uint8_t* p_codec_info,		void bta_av_co_audio_open(tBTA_AV_HNDL hndl, uint16_t mtu);
	uint16_t mtu);

	/*******************************************************************************		/*******************************************************************************
	*		*
	@@ -131,7 +130,7 @@ void bta_av_co_audio_open(tBTA_AV_HNDL hndl, uint8_t* p_codec_info,
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_av_co_audio_close(tBTA_AV_HNDL hndl, uint16_t mtu);		void bta_av_co_audio_close(tBTA_AV_HNDL hndl);

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