Merge "Integration of the LDAC codec for A2DP source" (bcd7ddbc) · Commits · e / os / android_packages_modules_Bluetooth

system/include/bt_target.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1100,7 +1100,7 @@

		/* Number of simultaneous stream endpoints. */
		#ifndef AVDT_NUM_SEPS
		#define AVDT_NUM_SEPS 3
		#define AVDT_NUM_SEPS 6
		#endif

		/* Number of transport channels setup by AVDT for all media streams */

system/stack/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ LOCAL_SRC_FILES := \
		./a2dp/a2dp_vendor_aptx_hd.cc \
		./a2dp/a2dp_vendor_aptx_encoder.cc \
		./a2dp/a2dp_vendor_aptx_hd_encoder.cc \
		./a2dp/a2dp_vendor_ldac.cc \
		./a2dp/a2dp_vendor_ldac_encoder.cc \
		./avct/avct_api.cc \
		./avct/avct_bcb_act.cc \
		./avct/avct_ccb.cc \

system/stack/a2dp/a2dp_codec_config.cc

+5 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include "a2dp_vendor.h"
		#include "a2dp_vendor_aptx.h"
		#include "a2dp_vendor_aptx_hd.h"
		#include "a2dp_vendor_ldac.h"
		#include "osi/include/log.h"

		/* The Media Type offset within the codec info byte array */
		@@ -90,6 +91,10 @@ A2dpCodecConfig* A2dpCodecConfig::createCodec(
		case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD:
		codec_config = new A2dpCodecConfigAptxHd();
		break;
		case BTAV_A2DP_CODEC_INDEX_SOURCE_LDAC:
		codec_config = new A2dpCodecConfigLdac();
		break;
		// Add a switch statement for each vendor-specific codec
		case BTAV_A2DP_CODEC_INDEX_MAX:
		break;
		}

system/stack/a2dp/a2dp_vendor.cc

+77 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include "a2dp_vendor.h"
		#include "a2dp_vendor_aptx.h"
		#include "a2dp_vendor_aptx_hd.h"
		#include "a2dp_vendor_ldac.h"
		#include "bt_target.h"
		#include "osi/include/log.h"
		#include "osi/include/osi.h"
		@@ -43,6 +44,11 @@ bool A2DP_IsVendorSourceCodecValid(const uint8_t* p_codec_info) {
		return A2DP_IsVendorSourceCodecValidAptxHd(p_codec_info);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_IsVendorSourceCodecValidLdac(p_codec_info);
		}

		// Add checks based on <vendor_id, codec_id>

		return false;
		@@ -85,6 +91,11 @@ bool A2DP_IsVendorPeerSinkCodecValid(const uint8_t* p_codec_info) {
		return A2DP_IsVendorPeerSinkCodecValidAptxHd(p_codec_info);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_IsVendorPeerSinkCodecValidLdac(p_codec_info);
		}

		// Add checks based on <vendor_id, codec_id>

		return false;
		@@ -159,6 +170,12 @@ bool A2DP_VendorUsesRtpHeader(bool content_protection_enabled,
		p_codec_info);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorUsesRtpHeaderLdac(content_protection_enabled,
		p_codec_info);
		}

		// Add checks based on <content_protection_enabled, vendor_id, codec_id>

		return true;
		@@ -180,6 +197,11 @@ const char* A2DP_VendorCodecName(UNUSED_ATTR const uint8_t* p_codec_info) {
		return A2DP_VendorCodecNameAptxHd(p_codec_info);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorCodecNameLdac(p_codec_info);
		}

		// Add checks based on <vendor_id, codec_id>

		return "UNKNOWN VENDOR CODEC";
		@@ -214,6 +236,11 @@ bool A2DP_VendorCodecTypeEquals(const uint8_t* p_codec_info_a,
		return A2DP_VendorCodecTypeEqualsAptxHd(p_codec_info_a, p_codec_info_b);
		}

		// Check for LDAC
		if (vendor_id_a == A2DP_LDAC_VENDOR_ID && codec_id_a == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorCodecTypeEqualsLdac(p_codec_info_a, p_codec_info_b);
		}

		// OPTIONAL: Add extra vendor-specific checks based on the
		// vendor-specific data stored in "p_codec_info_a" and "p_codec_info_b".

		@@ -249,6 +276,11 @@ bool A2DP_VendorCodecEquals(const uint8_t* p_codec_info_a,
		return A2DP_VendorCodecEqualsAptxHd(p_codec_info_a, p_codec_info_b);
		}

		// Check for LDAC
		if (vendor_id_a == A2DP_LDAC_VENDOR_ID && codec_id_a == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorCodecEqualsLdac(p_codec_info_a, p_codec_info_b);
		}

		// Add extra vendor-specific checks based on the
		// vendor-specific data stored in "p_codec_info_a" and "p_codec_info_b".

		@@ -271,6 +303,11 @@ int A2DP_VendorGetTrackSampleRate(const uint8_t* p_codec_info) {
		return A2DP_VendorGetTrackSampleRateAptxHd(p_codec_info);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorGetTrackSampleRateLdac(p_codec_info);
		}

		// Add checks based on <vendor_id, codec_id>

		return -1;
		@@ -292,6 +329,11 @@ int A2DP_VendorGetTrackBitsPerSample(const uint8_t* p_codec_info) {
		return A2DP_VendorGetTrackBitsPerSampleAptxHd(p_codec_info);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorGetTrackBitsPerSampleLdac(p_codec_info);
		}

		// Add checks based on <vendor_id, codec_id>

		return -1;
		@@ -313,6 +355,11 @@ int A2DP_VendorGetTrackChannelCount(const uint8_t* p_codec_info) {
		return A2DP_VendorGetTrackChannelCountAptxHd(p_codec_info);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorGetTrackChannelCountLdac(p_codec_info);
		}

		// Add checks based on <vendor_id, codec_id>

		return -1;
		@@ -360,6 +407,11 @@ bool A2DP_VendorGetPacketTimestamp(const uint8_t* p_codec_info,
		p_timestamp);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorGetPacketTimestampLdac(p_codec_info, p_data, p_timestamp);
		}

		// Add checks based on <vendor_id, codec_id>

		return false;
		@@ -384,6 +436,12 @@ bool A2DP_VendorBuildCodecHeader(const uint8_t* p_codec_info, BT_HDR* p_buf,
		frames_per_packet);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorBuildCodecHeaderLdac(p_codec_info, p_buf,
		frames_per_packet);
		}

		// Add checks based on <vendor_id, codec_id>

		return false;
		@@ -406,6 +464,11 @@ const tA2DP_ENCODER_INTERFACE* A2DP_VendorGetEncoderInterface(
		return A2DP_VendorGetEncoderInterfaceAptxHd(p_codec_info);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorGetEncoderInterfaceLdac(p_codec_info);
		}

		// Add checks based on <vendor_id, codec_id>

		return NULL;
		@@ -427,6 +490,11 @@ bool A2DP_VendorAdjustCodec(uint8_t* p_codec_info) {
		return A2DP_VendorAdjustCodecAptxHd(p_codec_info);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorAdjustCodecLdac(p_codec_info);
		}

		// Add checks based on <vendor_id, codec_id>

		return false;
		@@ -449,6 +517,11 @@ btav_a2dp_codec_index_t A2DP_VendorSourceCodecIndex(
		return A2DP_VendorSourceCodecIndexAptxHd(p_codec_info);
		}

		// Check for LDAC
		if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {
		return A2DP_VendorSourceCodecIndexLdac(p_codec_info);
		}

		// Add checks based on <vendor_id, codec_id>

		return BTAV_A2DP_CODEC_INDEX_MAX;
		@@ -464,6 +537,8 @@ const char* A2DP_VendorCodecIndexStr(btav_a2dp_codec_index_t codec_index) {
		return A2DP_VendorCodecIndexStrAptx();
		case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD:
		return A2DP_VendorCodecIndexStrAptxHd();
		case BTAV_A2DP_CODEC_INDEX_SOURCE_LDAC:
		return A2DP_VendorCodecIndexStrLdac();
		// Add a switch statement for each vendor-specific codec
		case BTAV_A2DP_CODEC_INDEX_MAX:
		break;
		@@ -483,6 +558,8 @@ bool A2DP_VendorInitCodecConfig(btav_a2dp_codec_index_t codec_index,
		return A2DP_VendorInitCodecConfigAptx(p_cfg);
		case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD:
		return A2DP_VendorInitCodecConfigAptxHd(p_cfg);
		case BTAV_A2DP_CODEC_INDEX_SOURCE_LDAC:
		return A2DP_VendorInitCodecConfigLdac(p_cfg);
		// Add a switch statement for each vendor-specific codec
		case BTAV_A2DP_CODEC_INDEX_MAX:
		break;

system/stack/a2dp/a2dp_vendor_ldac.cc

0 → 100644

+1102 −0

File added.

Preview size limit exceeded, changes collapsed.