Merge "system/stack: Apply clang-tidy fixes" into main (4b50815e) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/a2dp/a2dp_aac.cc

+36 −26

Original line number	Diff line number	Diff line
		@@ -28,10 +28,22 @@
		#include <bluetooth/log.h>
		#include <string.h>

		#include <algorithm>
		#include <cstdint>
		#include <ios>
		#include <mutex>
		#include <sstream>
		#include <string>

		#include "a2dp_aac_constants.h"
		#include "a2dp_aac_decoder.h"
		#include "a2dp_aac_encoder.h"
		#include "a2dp_api.h"
		#include "a2dp_codec_api.h"
		#include "a2dp_constants.h"
		#include "avdt_api.h"
		#include "hardware/bt_av.h"
		#include "internal_include/bt_trace.h"
		#include "osi/include/osi.h"
		#include "osi/include/properties.h"
		#include "stack/include/bt_hdr.h"

		@@ -592,36 +604,36 @@ std::string A2DP_CodecInfoStringAac(const uint8_t* p_codec_info) {

		// Object type
		field.clear();
		AppendField(&field, (aac_cie.objectType == 0), "NONE");
		AppendField(&field, (aac_cie.objectType & A2DP_AAC_OBJECT_TYPE_MPEG2_LC), "(MPEG-2 AAC LC)");
		AppendField(&field, (aac_cie.objectType & A2DP_AAC_OBJECT_TYPE_MPEG4_LC), "(MPEG-4 AAC LC)");
		AppendField(&field, (aac_cie.objectType & A2DP_AAC_OBJECT_TYPE_MPEG4_LTP), "(MPEG-4 AAC LTP)");
		AppendField(&field, (aac_cie.objectType & A2DP_AAC_OBJECT_TYPE_MPEG4_SCALABLE),
		AppendField(&field, aac_cie.objectType == 0, "NONE");
		AppendField(&field, aac_cie.objectType & A2DP_AAC_OBJECT_TYPE_MPEG2_LC, "(MPEG-2 AAC LC)");
		AppendField(&field, aac_cie.objectType & A2DP_AAC_OBJECT_TYPE_MPEG4_LC, "(MPEG-4 AAC LC)");
		AppendField(&field, aac_cie.objectType & A2DP_AAC_OBJECT_TYPE_MPEG4_LTP, "(MPEG-4 AAC LTP)");
		AppendField(&field, aac_cie.objectType & A2DP_AAC_OBJECT_TYPE_MPEG4_SCALABLE,
		"(MPEG-4 AAC Scalable)");
		res << "\tobjectType: " << field << " (" << loghex(aac_cie.objectType) << ")\n";

		// Sample frequency
		field.clear();
		AppendField(&field, (aac_cie.sampleRate == 0), "NONE");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_8000), "8000");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_11025), "11025");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_12000), "12000");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_16000), "16000");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_22050), "22050");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_24000), "24000");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_32000), "32000");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_44100), "44100");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_48000), "48000");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_64000), "64000");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_88200), "88200");
		AppendField(&field, (aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_96000), "96000");
		AppendField(&field, aac_cie.sampleRate == 0, "NONE");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_8000, "8000");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_11025, "11025");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_12000, "12000");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_16000, "16000");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_22050, "22050");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_24000, "24000");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_32000, "32000");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_44100, "44100");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_48000, "48000");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_64000, "64000");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_88200, "88200");
		AppendField(&field, aac_cie.sampleRate & A2DP_AAC_SAMPLING_FREQ_96000, "96000");
		res << "\tsamp_freq: " << field << " (" << loghex(aac_cie.sampleRate) << ")\n";

		// Channel mode
		field.clear();
		AppendField(&field, (aac_cie.channelMode == 0), "NONE");
		AppendField(&field, (aac_cie.channelMode == A2DP_AAC_CHANNEL_MODE_MONO), "Mono");
		AppendField(&field, (aac_cie.channelMode == A2DP_AAC_CHANNEL_MODE_STEREO), "Stereo");
		AppendField(&field, aac_cie.channelMode == 0, "NONE");
		AppendField(&field, aac_cie.channelMode == A2DP_AAC_CHANNEL_MODE_MONO, "Mono");
		AppendField(&field, aac_cie.channelMode == A2DP_AAC_CHANNEL_MODE_STEREO, "Stereo");
		res << "\tch_mode: " << field << " (" << loghex(aac_cie.channelMode) << ")\n";

		// Variable bit rate support
		@@ -634,8 +646,7 @@ std::string A2DP_CodecInfoStringAac(const uint8_t* p_codec_info) {
		return res.str();
		}

		const tA2DP_ENCODER_INTERFACE* A2DP_GetEncoderInterfaceAac(
		const uint8_t* p_codec_info) {
		const tA2DP_ENCODER_INTERFACE* A2DP_GetEncoderInterfaceAac(const uint8_t* p_codec_info) {
		if (!A2DP_IsCodecValidAac(p_codec_info)) {
		return NULL;
		}
		@@ -643,8 +654,7 @@ const tA2DP_ENCODER_INTERFACE* A2DP_GetEncoderInterfaceAac(
		return &a2dp_encoder_interface_aac;
		}

		const tA2DP_DECODER_INTERFACE* A2DP_GetDecoderInterfaceAac(
		const uint8_t* p_codec_info) {
		const tA2DP_DECODER_INTERFACE* A2DP_GetDecoderInterfaceAac(const uint8_t* p_codec_info) {
		if (!A2DP_IsCodecValidAac(p_codec_info)) {
		return NULL;
		}

system/stack/a2dp/a2dp_aac_decoder.cc

+7 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,13 @@
		#include <aacdecoder_lib.h>
		#include <bluetooth/log.h>

		#include <cstddef>
		#include <cstdint>
		#include <cstring>

		#include "FDK_audio.h"
		#include "a2dp_codec_api.h"
		#include "machine_type.h"
		#include "osi/include/allocator.h"
		#include "stack/include/bt_hdr.h"

system/stack/a2dp/a2dp_aac_encoder.cc

+8 −0

Original line number	Diff line number	Diff line
		@@ -18,12 +18,20 @@

		#include "a2dp_aac_encoder.h"

		#include <FDK_audio.h>
		#include <aacenc_lib.h>
		#include <bluetooth/log.h>
		#include <inttypes.h>
		#include <stdio.h>
		#include <string.h>

		#include <algorithm>
		#include <cstdint>

		#include "a2dp_aac.h"
		#include "a2dp_aac_constants.h"
		#include "a2dp_codec_api.h"
		#include "avdt_api.h"
		#include "common/time_util.h"
		#include "internal_include/bt_target.h"
		#include "osi/include/allocator.h"

system/stack/a2dp/a2dp_api.cc

+5 −0

Original line number	Diff line number	Diff line
		@@ -29,10 +29,15 @@
		#include <bluetooth/log.h>
		#include <string.h>

		#include <cstdint>

		#include "a2dp_constants.h"
		#include "a2dp_int.h"
		#include "avdt_api.h"
		#include "internal_include/bt_target.h"
		#include "osi/include/allocator.h"
		#include "sdp_discovery_db.h"
		#include "sdp_status.h"
		#include "sdpdefs.h"
		#include "stack/include/bt_types.h"
		#include "stack/include/bt_uuid16.h"

system/stack/a2dp/a2dp_codec_config.cc

+18 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,18 @@
		#define LOG_TAG "bluetooth-a2dp"

		#include <bluetooth/log.h>
		#include <stdio.h>

		#include <cstddef>
		#include <cstdint>
		#include <cstring>
		#include <ios>
		#include <mutex>
		#include <optional>
		#include <sstream>
		#include <string>
		#include <utility>
		#include <vector>

		#include "a2dp_aac.h"
		#include "a2dp_codec_api.h"
		@@ -28,6 +40,12 @@
		#include "a2dp_ext.h"
		#include "a2dp_sbc.h"
		#include "a2dp_vendor.h"
		#include "a2dp_vendor_aptx_constants.h"
		#include "a2dp_vendor_aptx_hd_constants.h"
		#include "a2dp_vendor_ldac_constants.h"
		#include "avdt_api.h"
		#include "device/include/device_iot_conf_defs.h"
		#include "hardware/bt_av.h"

		#if !defined(EXCLUDE_NONSTANDARD_CODECS)
		#include "a2dp_vendor_aptx.h"
		@@ -38,8 +56,6 @@

		#include "audio_hal_interface/a2dp_encoding.h"
		#include "bta/av/bta_av_int.h"
		#include "device/include/device_iot_config.h"
		#include "internal_include/bt_trace.h"
		#include "osi/include/properties.h"
		#include "stack/include/bt_hdr.h"