Snap for 5180536 from 5b8bd2429d128b91c52b17e6a06d299c3a5f4408 to pi-platform-release (9ceb6038) · Commits · e / os / android_packages_modules_Bluetooth

system/audio_a2dp_hw/src/audio_a2dp_hw.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -1680,6 +1680,8 @@ static void adev_close_output_stream(struct audio_hw_device* dev,
		struct a2dp_audio_device* a2dp_dev = (struct a2dp_audio_device*)dev;
		struct a2dp_stream_out* out = (struct a2dp_stream_out*)stream;

		INFO("%s: state %d", __func__, out->common.state);

		// prevent interference with adev_set_parameters.
		std::lock_guard<std::recursive_mutex> lock(*a2dp_dev->mutex);
		{

system/bta/hearing_aid/hearing_aid.cc

+331 −99

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/hearing_aid/hearing_aid_audio_source.cc

+39 −8

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		******************************************************************************/

		#include "audio_hearing_aid_hw/include/audio_hearing_aid_hw.h"
		#include "bta_closure_api.h"
		#include "bta_hearing_aid_api.h"
		#include "osi/include/alarm.h"
		#include "uipc.h"
		@@ -28,9 +29,9 @@ using base::FilePath;
		extern const char* audio_ha_hw_dump_ctrl_event(tHEARING_AID_CTRL_CMD event);

		namespace {
		int bit_rate = 16;
		int sample_rate = 16000;
		int data_interval_ms = 10 /* msec */;
		int bit_rate = -1;
		int sample_rate = -1;
		int data_interval_ms = -1;
		int num_channels = 2;
		alarm_t* audio_timer = nullptr;

		@@ -94,6 +95,11 @@ void hearing_aid_data_cb(tUIPC_CH_ID, tUIPC_EVENT event) {
		UIPC_Ioctl(*uipc_hearing_aid, UIPC_CH_ID_AV_AUDIO, UIPC_SET_READ_POLL_TMO,
		reinterpret_cast<void*>(0));

		if (data_interval_ms != HA_INTERVAL_10_MS &&
		data_interval_ms != HA_INTERVAL_20_MS) {
		LOG(FATAL) << " Unsupported data interval: " << data_interval_ms;
		}

		audio_timer = alarm_new_periodic("hearing_aid_data_timer");
		alarm_set_on_mloop(audio_timer, data_interval_ms, send_audio_data,
		nullptr);
		@@ -124,7 +130,7 @@ void hearing_aid_recv_ctrl_data() {
		return;
		}

		VLOG(2) << __func__ << " " << audio_ha_hw_dump_ctrl_event(cmd);
		LOG(INFO) << __func__ << " " << audio_ha_hw_dump_ctrl_event(cmd);
		// a2dp_cmd_pending = cmd;

		switch (cmd) {
		@@ -133,7 +139,17 @@ void hearing_aid_recv_ctrl_data() {
		break;

		case HEARING_AID_CTRL_CMD_START:
		if (localAudioReceiver) localAudioReceiver->OnAudioResume();
		if (localAudioReceiver) {
		// Call OnAudioResume and block till it returns.
		std::promise<void> do_resume_promise;
		std::future<void> do_resume_future = do_resume_promise.get_future();
		do_in_bta_thread_once(
		FROM_HERE, base::BindOnce(&HearingAidAudioReceiver::OnAudioResume,
		base::Unretained(localAudioReceiver),
		std::move(do_resume_promise)));
		do_resume_future.wait();
		}

		// timer is restarted in UIPC_Open
		UIPC_Open(*uipc_hearing_aid, UIPC_CH_ID_AV_AUDIO, hearing_aid_data_cb,
		HEARING_AID_DATA_PATH);
		@@ -146,7 +162,16 @@ void hearing_aid_recv_ctrl_data() {

		case HEARING_AID_CTRL_CMD_SUSPEND:
		if (audio_timer) alarm_cancel(audio_timer);
		if (localAudioReceiver) localAudioReceiver->OnAudioSuspend();
		if (localAudioReceiver) {
		// Call OnAudioSuspend and block till it returns.
		std::promise<void> do_suspend_promise;
		std::future<void> do_suspend_future = do_suspend_promise.get_future();
		do_in_bta_thread_once(
		FROM_HERE, base::BindOnce(&HearingAidAudioReceiver::OnAudioSuspend,
		base::Unretained(localAudioReceiver),
		std::move(do_suspend_promise)));
		do_suspend_future.wait();
		}
		hearing_aid_send_ack(HEARING_AID_CTRL_ACK_SUCCESS);
		break;

		@@ -240,7 +265,8 @@ void hearing_aid_recv_ctrl_data() {
		hearing_aid_send_ack(HEARING_AID_CTRL_ACK_FAILURE);
		break;
		}
		VLOG(2) << __func__ << " a2dp-ctrl-cmd : " << audio_ha_hw_dump_ctrl_event(cmd)
		LOG(INFO) << __func__
		<< " a2dp-ctrl-cmd : " << audio_ha_hw_dump_ctrl_event(cmd)
		<< " DONE";
		}

		@@ -266,6 +292,11 @@ void HearingAidAudioSource::Start(const CodecConfiguration& codecConfiguration,
		HearingAidAudioReceiver* audioReceiver) {
		localAudioReceiver = audioReceiver;
		VLOG(2) << "Hearing Aid UIPC Open";

		bit_rate = codecConfiguration.bit_rate;
		sample_rate = codecConfiguration.sample_rate;
		data_interval_ms = codecConfiguration.data_interval_ms;

		stats.Reset();
		}

system/bta/hl/bta_hl_main.cc

+1 −4

Original line number	Diff line number	Diff line
		@@ -1404,14 +1404,13 @@ static void bta_hl_sdp_query_results(UNUSED_ATTR tBTA_HL_CB* p_cb,
		tBTA_HL_MCL_CB* p_mcb = BTA_HL_GET_MCL_CB_PTR(app_idx, mcl_idx);
		tBTA_HL_SDP* p_sdp = NULL;
		uint16_t event;
		bool release_sdp_buf = false;

		event = p_data->hdr.event;

		if (event == BTA_HL_SDP_QUERY_OK_EVT) {
		// this is freed in btif_hl_proc_sdp_query_cfm
		p_sdp = (tBTA_HL_SDP*)osi_malloc(sizeof(tBTA_HL_SDP));
		memcpy(p_sdp, &p_mcb->sdp, sizeof(tBTA_HL_SDP));
		release_sdp_buf = true;
		} else {
		status = BTA_HL_STATUS_SDP_FAIL;
		}
		@@ -1430,8 +1429,6 @@ static void bta_hl_sdp_query_results(UNUSED_ATTR tBTA_HL_CB* p_cb,
		p_mcb->bd_addr, p_sdp, status);
		p_acb->p_cback(BTA_HL_SDP_QUERY_CFM_EVT, (tBTA_HL*)&evt_data);

		if (release_sdp_buf) osi_free_and_reset((void**)&p_sdp);

		if (p_data->cch_sdp.release_mcl_cb) {
		memset(p_mcb, 0, sizeof(tBTA_HL_MCL_CB));
		} else {

system/bta/include/bta_closure_api.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -34,5 +34,7 @@
		*/
		bt_status_t do_in_bta_thread(const tracked_objects::Location& from_here,
		const base::Closure& task);
		bt_status_t do_in_bta_thread_once(const tracked_objects::Location& from_here,
		base::OnceClosure task);

		#endif /* BTA_CLOSURE_API_H */