Merge "BTIF A2DP Source and Sink refactor and cleanup" (2a93e994) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,6 @@ LOCAL_SRC_FILES:= \
		./av/bta_av_main.c \
		./av/bta_av_cfg.c \
		./av/bta_av_ssm.c \
		./av/bta_av_sbc.c \
		./ar/bta_ar.c \
		./hl/bta_hl_act.c \
		./hl/bta_hl_api.c \

system/bta/BUILD.gn

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ static_library("bta") {
		"av/bta_av_cfg.c",
		"av/bta_av_ci.c",
		"av/bta_av_main.c",
		"av/bta_av_sbc.c",
		"av/bta_av_ssm.c",
		"closure/bta_closure.cc",
		"dm/bta_dm_act.cc",

system/btif/co/bta_av_co.cc

+31 −14

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

		#include <assert.h>
		#include <string.h>
		#include "a2d_api.h"
		#include "bt_target.h"
		@@ -765,7 +766,7 @@ void* bta_av_co_audio_src_data_path(const uint8_t *p_codec_info,

		APPL_TRACE_DEBUG("%s: codec: %s", __func__, A2D_CodecName(p_codec_info));

		p_buf = btif_a2dp_source_aa_readbuf();
		p_buf = btif_a2dp_source_audio_readbuf();
		if (p_buf == NULL)
		return NULL;

		@@ -1069,11 +1070,11 @@ static void bta_av_co_audio_codec_reset(void)
		** Returns true if successful, false otherwise
		**
		*******************************************************************************/
		bool bta_av_co_audio_set_codec(const tA2D_AV_MEDIA_FEEDINGS *p_feeding)
		bool bta_av_co_audio_set_codec(const tA2D_FEEDING_PARAMS *p_feeding_params)
		{
		uint8_t new_cfg[AVDT_CODEC_SIZE];

		if (!A2D_SetCodec(p_feeding, new_cfg))
		if (!A2D_SetCodec(p_feeding_params, new_cfg))
		return false;

		/* The new config was correctly built */
		@@ -1083,11 +1084,12 @@ bool bta_av_co_audio_set_codec(const tA2D_AV_MEDIA_FEEDINGS *p_feeding)
		return bta_av_co_audio_codec_supported();
		}

		void bta_av_co_audio_encoder_init(tBTIF_A2DP_SOURCE_INIT_AUDIO *msg)
		void bta_av_co_audio_encoder_init(tA2D_ENCODER_INIT_PARAMS *p_init_params)
		{
		uint16_t min_mtu = 0xFFFF;

		APPL_TRACE_DEBUG("%s", __func__);
		assert(p_init_params != nullptr);

		/* Protect access to bta_av_co_cb.codec_cfg */
		mutex_global_lock();
		@@ -1102,22 +1104,23 @@ void bta_av_co_audio_encoder_init(tBTIF_A2DP_SOURCE_INIT_AUDIO *msg)
		}

		const uint8_t *p_codec_info = bta_av_co_cb.codec_cfg;
		msg->NumOfSubBands = A2D_GetNumberOfSubbands(p_codec_info);
		msg->NumOfBlocks = A2D_GetNumberOfBlocks(p_codec_info);
		msg->AllocationMethod = A2D_GetAllocationMethodCode(p_codec_info);
		msg->ChannelMode = A2D_GetChannelModeCode(p_codec_info);
		msg->SamplingFreq = A2D_GetSamplingFrequencyCode(p_codec_info);
		msg->MtuSize = min_mtu;
		p_init_params->NumOfSubBands = A2D_GetNumberOfSubbands(p_codec_info);
		p_init_params->NumOfBlocks = A2D_GetNumberOfBlocks(p_codec_info);
		p_init_params->AllocationMethod = A2D_GetAllocationMethodCode(p_codec_info);
		p_init_params->ChannelMode = A2D_GetChannelModeCode(p_codec_info);
		p_init_params->SamplingFreq = A2D_GetSamplingFrequencyCode(p_codec_info);
		p_init_params->MtuSize = min_mtu;

		/* Protect access to bta_av_co_cb.codec_cfg */
		mutex_global_unlock();
		}

		void bta_av_co_audio_encoder_update(tBTIF_A2DP_SOURCE_UPDATE_AUDIO *msg)
		void bta_av_co_audio_encoder_update(tA2D_ENCODER_UPDATE_PARAMS *p_update_params)
		{
		uint16_t min_mtu = 0xFFFF;

		APPL_TRACE_DEBUG("%s", __func__);
		assert(p_update_params != nullptr);

		/* Protect access to bta_av_co_cb.codec_cfg */
		mutex_global_lock();
		@@ -1186,9 +1189,23 @@ void bta_av_co_audio_encoder_update(tBTIF_A2DP_SOURCE_UPDATE_AUDIO *msg)
		return;
		}

		msg->MinMtuSize = min_mtu;
		msg->MinBitPool = min_bitpool;
		msg->MaxBitPool = max_bitpool;
		p_update_params->MinMtuSize = min_mtu;
		p_update_params->MinBitPool = min_bitpool;
		p_update_params->MaxBitPool = max_bitpool;
		}

		const tA2D_ENCODER_INTERFACE *bta_av_co_get_encoder_interface(void)
		{
		/* Protect access to bta_av_co_cb.codec_cfg */
		mutex_global_lock();

		const tA2D_ENCODER_INTERFACE *encoder_interface =
		A2D_GetEncoderInterface(bta_av_co_cb.codec_cfg);

		/* Protect access to bta_av_co_cb.codec_cfg */
		mutex_global_unlock();

		return encoder_interface;
		}

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

system/btif/include/btif_a2dp.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -28,14 +28,6 @@
		extern "C" {
		#endif

		//
		// \|MAX_PCM_FRAME_NUM_PER_TICK\| controls how many buffers we can hold in
		// the A2DP buffer queues during temporary link congestion.
		//
		#ifndef MAX_PCM_FRAME_NUM_PER_TICK
		#define MAX_PCM_FRAME_NUM_PER_TICK 14
		#endif

		// Process 'idle' request from the BTIF state machine during initialization.
		void btif_a2dp_on_idle(void);

system/btif/include/btif_a2dp_sink.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ extern "C" {
		typedef enum {
		BTIF_A2DP_SINK_FOCUS_NOT_GRANTED = 0,
		BTIF_A2DP_SINK_FOCUS_GRANTED = 1
		} btif_a2dp_sink_audio_focus_state_t;
		} btif_a2dp_sink_focus_state_t;

		// Initialize and startup the A2DP Sink module.
		// This function should be called by the BTIF state machine prior to using the
		@@ -97,9 +97,9 @@ void btif_a2dp_sink_debug_dump(int fd);
		void btif_a2dp_sink_update_metrics(void);

		// Create a request to set the audio focus state for the audio track.
		// \|state\| is the new state value - see \|btif_a2dp_sink_audio_focus_state_t\|
		// \|state\| is the new state value - see \|btif_a2dp_sink_focus_state_t\|
		// for valid values.
		void btif_a2dp_sink_set_audio_focus_state_req(btif_a2dp_sink_audio_focus_state_t state);
		void btif_a2dp_sink_set_focus_state_req(btif_a2dp_sink_focus_state_t state);

		// Set the audio track gain for the audio track.
		// \|gain\| is the audio track gain value to use.