Integration of the AAC codec for A2DP source (26fad94e) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/av/bta_av_aact.cc

+45 −2

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@

		#include <base/logging.h>
		#include <string.h>
		#include <vector>

		#include "avdt_api.h"
		#include "bt_utils.h"
		@@ -2088,8 +2089,7 @@ void bta_av_data_path(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {
		BT_HDR* p_buf = NULL;
		uint32_t timestamp;
		bool new_buf = false;
		tA2DP_CODEC_TYPE codec_type = A2DP_GetCodecType(p_scb->cfg.codec_info);
		uint8_t m_pt = 0x60 \| codec_type;
		uint8_t m_pt = AVDT_MARKER_SET \| 0x60;
		tAVDT_DATA_OPT_MASK opt;

		if (p_scb->cong) return;
		@@ -2130,7 +2130,50 @@ void bta_av_data_path(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {
		opt \|= AVDT_DATA_OPT_NO_RTP;
		}

		//
		// Fragment the payload if larger than the MTU.
		// NOTE: The fragmentation is RTP-compatibie.
		//
		size_t extra_fragments_n = 0;
		if (p_buf->len > 0) {
		extra_fragments_n = (p_buf->len / p_scb->stream_mtu) +
		((p_buf->len % p_scb->stream_mtu) ? 1 : 0) - 1;
		}
		std::vector<BT_HDR*> extra_fragments;
		extra_fragments.reserve(extra_fragments_n);

		uint8_t* data_begin = (uint8_t*)(p_buf + 1) + p_buf->offset;
		uint8_t* data_end = (uint8_t*)(p_buf + 1) + p_buf->offset + p_buf->len;
		while (extra_fragments_n-- > 0) {
		data_begin += p_scb->stream_mtu;
		size_t fragment_len = data_end - data_begin;
		if (fragment_len > p_scb->stream_mtu) fragment_len = p_scb->stream_mtu;

		BT_HDR* p_buf2 = (BT_HDR*)osi_malloc(BT_DEFAULT_BUFFER_SIZE);
		p_buf2->offset = p_buf->offset;
		p_buf2->len = 0;
		p_buf2->layer_specific = 0;
		uint8_t* packet2 =
		(uint8_t*)(p_buf2 + 1) + p_buf2->offset + p_buf2->len;
		memcpy(packet2, data_begin, fragment_len);
		p_buf2->len += fragment_len;
		extra_fragments.push_back(p_buf2);
		p_buf->len -= fragment_len;
		}

		if (!extra_fragments.empty()) {
		// Reset the RTP Marker bit for all fragments except the last one
		m_pt &= ~AVDT_MARKER_SET;
		}
		AVDT_WriteReqOpt(p_scb->avdt_handle, p_buf, timestamp, m_pt, opt);
		for (size_t i = 0; i < extra_fragments.size(); i++) {
		if (i + 1 == extra_fragments.size()) {
		// Set the RTP Marker bit for the last fragment
		m_pt \|= AVDT_MARKER_SET;
		}
		BT_HDR* p_buf2 = extra_fragments[i];
		AVDT_WriteReqOpt(p_scb->avdt_handle, p_buf2, timestamp, m_pt, opt);
		}
		p_scb->cong = true;
		} else {
		/* there's a buffer, but L2CAP does not seem to be moving data */

system/main/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ cc_library_shared {
		static_libs: [
		"libbt-sbc-decoder",
		"libbt-sbc-encoder",
		"libFraunhoferAAC",
		"libudrv-uipc",
		],
		whole_static_libs: [

system/stack/Android.bp

+9 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ cc_library_static {
		"srvc",
		],
		include_dirs: [
		"external/aac/libAACenc/include",
		"external/aac/libSYS/include",
		"external/libldac/inc",
		"packages/modules/Bluetooth/system",
		"packages/modules/Bluetooth/system/btcore/include",
		@@ -34,6 +36,8 @@ cc_library_static {
		"packages/modules/Bluetooth/system/utils/include",
		],
		srcs: [
		"a2dp/a2dp_aac.cc",
		"a2dp/a2dp_aac_encoder.cc",
		"a2dp/a2dp_api.cc",
		"a2dp/a2dp_codec_config.cc",
		"a2dp/a2dp_sbc.cc",
		@@ -162,7 +166,10 @@ cc_library_static {
		"srvc/srvc_dis.cc",
		"srvc/srvc_eng.cc",
		],
		static_libs: ["libbt-hci"],
		static_libs: [
		"libbt-hci",
		"libFraunhoferAAC",
		],
		shared_libs: [
		"libcutils",
		"liblog",
		@@ -191,6 +198,7 @@ cc_test {
		static_libs: [
		"libbt-stack",
		"libbt-sbc-encoder",
		"libFraunhoferAAC",
		"libosi",
		],
		}

system/stack/a2dp/a2dp_aac.cc

0 → 100644

+1175 −0

File added.

Preview size limit exceeded, changes collapsed.

system/stack/a2dp/a2dp_aac_encoder.cc

0 → 100644

+660 −0

File added.

Preview size limit exceeded, changes collapsed.