From 872d4a6518128928fc7c000dafcf82cb0d6aa850 Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Thu, 9 Mar 2023 18:19:01 -0800 Subject: [PATCH] audio: Put audio/aidl/common/include/Utils.h into 'aidl' NS These utilities are for types generated from AIDL. Since the types end up in the 'aidl' namespace (NDK backend), it makes sense to keep the utilities in the same namespace. While changing the namespace, I've found numerous useless includes of 'Utils.h' and removing them, also reorganizing lists of includes along the way to match the style guide. Bug: 205884982 Test: m Test: atest --test-mapping hardware/interfaces/audio/aidl/TEST_MAPPING Change-Id: Ib23b47092364046f632f9503b92b9baff5b902f5 --- audio/aidl/common/include/Utils.h | 4 ++-- audio/aidl/common/tests/utils_tests.cpp | 6 +++--- audio/aidl/default/Configuration.cpp | 2 +- audio/aidl/default/Module.cpp | 6 +++--- audio/aidl/default/Stream.cpp | 4 ++-- audio/aidl/default/Telephony.cpp | 2 +- .../AcousticEchoCancelerSw.cpp | 3 +-- .../AutomaticGainControlV2Sw.cpp | 4 +--- audio/aidl/default/bassboost/BassBoostSw.cpp | 4 +--- audio/aidl/default/downmix/DownmixSw.cpp | 6 ++---- .../DynamicsProcessingSw.cpp | 9 ++++---- .../dynamicProcessing/DynamicsProcessingSw.h | 9 +++++--- audio/aidl/default/envReverb/EnvReverbSw.cpp | 5 ++--- audio/aidl/default/equalizer/EqualizerSw.cpp | 6 ++---- .../default/extension/ExtensionEffect.cpp | 3 +-- .../hapticGenerator/HapticGeneratorSw.cpp | 6 ++---- .../include/effect-impl/EffectContext.h | 6 +++--- .../loudnessEnhancer/LoudnessEnhancerSw.cpp | 6 ++---- .../noiseSuppression/NoiseSuppressionSw.cpp | 4 +--- .../default/presetReverb/PresetReverbSw.cpp | 6 ++---- audio/aidl/default/usb/ModuleUsb.cpp | 2 +- audio/aidl/default/usb/StreamUsb.cpp | 2 +- audio/aidl/default/usb/UsbAlsaUtils.cpp | 4 ++-- .../default/virtualizer/VirtualizerSw.cpp | 7 +++---- audio/aidl/default/volume/VolumeSw.cpp | 6 ++---- audio/aidl/vts/EffectHelper.h | 3 ++- audio/aidl/vts/ModuleConfig.cpp | 2 +- audio/aidl/vts/VtsHalAECTargetTest.cpp | 6 +++--- audio/aidl/vts/VtsHalAGC1TargetTest.cpp | 3 +-- audio/aidl/vts/VtsHalAGC2TargetTest.cpp | 8 +++---- .../vts/VtsHalAudioCoreConfigTargetTest.cpp | 21 ++++++++++++++++--- .../vts/VtsHalAudioCoreModuleTargetTest.cpp | 8 +++---- .../aidl/vts/VtsHalAudioEffectTargetTest.cpp | 1 - audio/aidl/vts/VtsHalBassBoostTargetTest.cpp | 8 +++---- audio/aidl/vts/VtsHalDownmixTargetTest.cpp | 6 +++--- .../aidl/vts/VtsHalDynamicsProcessingTest.cpp | 12 +++++------ .../VtsHalEnvironmentalReverbTargetTest.cpp | 7 +++---- audio/aidl/vts/VtsHalEqualizerTargetTest.cpp | 9 +++----- .../vts/VtsHalHapticGeneratorTargetTest.cpp | 10 ++++----- .../vts/VtsHalLoudnessEnhancerTargetTest.cpp | 4 ++-- audio/aidl/vts/VtsHalNSTargetTest.cpp | 12 +++++------ .../aidl/vts/VtsHalPresetReverbTargetTest.cpp | 6 +++--- .../aidl/vts/VtsHalVirtualizerTargetTest.cpp | 6 +++--- audio/aidl/vts/VtsHalVisualizerTargetTest.cpp | 13 ++++++------ audio/aidl/vts/VtsHalVolumeTargetTest.cpp | 6 +++--- 45 files changed, 130 insertions(+), 143 deletions(-) diff --git a/audio/aidl/common/include/Utils.h b/audio/aidl/common/include/Utils.h index 32c36b85f2..2cf862c81d 100644 --- a/audio/aidl/common/include/Utils.h +++ b/audio/aidl/common/include/Utils.h @@ -30,7 +30,7 @@ #include #include -namespace android::hardware::audio::common { +namespace aidl::android::hardware::audio::common { // Some values are reserved for use by the system code only. // HALs must not accept or emit values outside from the provided list. @@ -176,4 +176,4 @@ constexpr U makeBitPositionFlagMask(std::initializer_list flags) { return result; } -} // namespace android::hardware::audio::common +} // namespace aidl::android::hardware::audio::common diff --git a/audio/aidl/common/tests/utils_tests.cpp b/audio/aidl/common/tests/utils_tests.cpp index d7f1a5d356..1b8b8dfcf2 100644 --- a/audio/aidl/common/tests/utils_tests.cpp +++ b/audio/aidl/common/tests/utils_tests.cpp @@ -26,13 +26,13 @@ #define LOG_TAG "Utils_Test" #include +using aidl::android::hardware::audio::common::getChannelCount; +using aidl::android::hardware::audio::common::getFrameSizeInBytes; +using aidl::android::hardware::audio::common::getPcmSampleSizeInBytes; using aidl::android::media::audio::common::AudioChannelLayout; using aidl::android::media::audio::common::AudioFormatDescription; using aidl::android::media::audio::common::AudioFormatType; using aidl::android::media::audio::common::PcmType; -using android::hardware::audio::common::getChannelCount; -using android::hardware::audio::common::getFrameSizeInBytes; -using android::hardware::audio::common::getPcmSampleSizeInBytes; TEST(UtilsTest, ChannelCountOddCases) { using Tag = AudioChannelLayout::Tag; diff --git a/audio/aidl/default/Configuration.cpp b/audio/aidl/default/Configuration.cpp index a72be24034..e1e1f79376 100644 --- a/audio/aidl/default/Configuration.cpp +++ b/audio/aidl/default/Configuration.cpp @@ -25,6 +25,7 @@ #include "core-impl/Configuration.h" +using aidl::android::hardware::audio::common::makeBitPositionFlagMask; using aidl::android::media::audio::common::AudioChannelLayout; using aidl::android::media::audio::common::AudioDeviceDescription; using aidl::android::media::audio::common::AudioDeviceType; @@ -42,7 +43,6 @@ using aidl::android::media::audio::common::AudioProfile; using aidl::android::media::audio::common::Int; using aidl::android::media::audio::common::MicrophoneInfo; using aidl::android::media::audio::common::PcmType; -using android::hardware::audio::common::makeBitPositionFlagMask; namespace aidl::android::hardware::audio::core::internal { diff --git a/audio/aidl/default/Module.cpp b/audio/aidl/default/Module.cpp index c95c199494..984b9a1014 100644 --- a/audio/aidl/default/Module.cpp +++ b/audio/aidl/default/Module.cpp @@ -34,6 +34,9 @@ #include "core-impl/Telephony.h" #include "core-impl/utils.h" +using aidl::android::hardware::audio::common::getFrameSizeInBytes; +using aidl::android::hardware::audio::common::isBitPositionFlagSet; +using aidl::android::hardware::audio::common::isValidAudioMode; using aidl::android::hardware::audio::common::SinkMetadata; using aidl::android::hardware::audio::common::SourceMetadata; using aidl::android::hardware::audio::core::sounddose::ISoundDose; @@ -57,9 +60,6 @@ using aidl::android::media::audio::common::Boolean; using aidl::android::media::audio::common::Int; using aidl::android::media::audio::common::MicrophoneInfo; using aidl::android::media::audio::common::PcmType; -using android::hardware::audio::common::getFrameSizeInBytes; -using android::hardware::audio::common::isBitPositionFlagSet; -using android::hardware::audio::common::isValidAudioMode; namespace aidl::android::hardware::audio::core { diff --git a/audio/aidl/default/Stream.cpp b/audio/aidl/default/Stream.cpp index 871480b967..77b06011c6 100644 --- a/audio/aidl/default/Stream.cpp +++ b/audio/aidl/default/Stream.cpp @@ -25,6 +25,8 @@ #include "core-impl/Stream.h" using aidl::android::hardware::audio::common::AudioOffloadMetadata; +using aidl::android::hardware::audio::common::getChannelCount; +using aidl::android::hardware::audio::common::getFrameSizeInBytes; using aidl::android::hardware::audio::common::SinkMetadata; using aidl::android::hardware::audio::common::SourceMetadata; using aidl::android::media::audio::common::AudioDevice; @@ -34,8 +36,6 @@ using aidl::android::media::audio::common::AudioOffloadInfo; using aidl::android::media::audio::common::AudioPlaybackRate; using aidl::android::media::audio::common::MicrophoneDynamicInfo; using aidl::android::media::audio::common::MicrophoneInfo; -using android::hardware::audio::common::getChannelCount; -using android::hardware::audio::common::getFrameSizeInBytes; namespace aidl::android::hardware::audio::core { diff --git a/audio/aidl/default/Telephony.cpp b/audio/aidl/default/Telephony.cpp index ad2247015a..bf05a8da98 100644 --- a/audio/aidl/default/Telephony.cpp +++ b/audio/aidl/default/Telephony.cpp @@ -22,10 +22,10 @@ #include "core-impl/Telephony.h" +using aidl::android::hardware::audio::common::isValidAudioMode; using aidl::android::media::audio::common::AudioMode; using aidl::android::media::audio::common::Boolean; using aidl::android::media::audio::common::Float; -using android::hardware::audio::common::isValidAudioMode; namespace aidl::android::hardware::audio::core { diff --git a/audio/aidl/default/acousticEchoCanceler/AcousticEchoCancelerSw.cpp b/audio/aidl/default/acousticEchoCanceler/AcousticEchoCancelerSw.cpp index f5af81e52b..561f9a32ad 100644 --- a/audio/aidl/default/acousticEchoCanceler/AcousticEchoCancelerSw.cpp +++ b/audio/aidl/default/acousticEchoCanceler/AcousticEchoCancelerSw.cpp @@ -17,10 +17,9 @@ #include #include #include -#define LOG_TAG "AHAL_AcousticEchoCancelerSw" -#include #include +#define LOG_TAG "AHAL_AcousticEchoCancelerSw" #include #include diff --git a/audio/aidl/default/automaticGainControlV2/AutomaticGainControlV2Sw.cpp b/audio/aidl/default/automaticGainControlV2/AutomaticGainControlV2Sw.cpp index 8441f229fb..50712a4f5b 100644 --- a/audio/aidl/default/automaticGainControlV2/AutomaticGainControlV2Sw.cpp +++ b/audio/aidl/default/automaticGainControlV2/AutomaticGainControlV2Sw.cpp @@ -17,10 +17,8 @@ #include #include #include -#define LOG_TAG "AHAL_AutomaticGainControlV2Sw" -#include -#include +#define LOG_TAG "AHAL_AutomaticGainControlV2Sw" #include #include diff --git a/audio/aidl/default/bassboost/BassBoostSw.cpp b/audio/aidl/default/bassboost/BassBoostSw.cpp index e50f0a2623..fb5374f3cc 100644 --- a/audio/aidl/default/bassboost/BassBoostSw.cpp +++ b/audio/aidl/default/bassboost/BassBoostSw.cpp @@ -17,10 +17,8 @@ #include #include #include -#define LOG_TAG "AHAL_BassBoostSw" -#include -#include +#define LOG_TAG "AHAL_BassBoostSw" #include #include diff --git a/audio/aidl/default/downmix/DownmixSw.cpp b/audio/aidl/default/downmix/DownmixSw.cpp index 0af95d0bd4..81a4c89fd6 100644 --- a/audio/aidl/default/downmix/DownmixSw.cpp +++ b/audio/aidl/default/downmix/DownmixSw.cpp @@ -14,12 +14,10 @@ * limitations under the License. */ -#include -#define LOG_TAG "AHAL_DownmixSw" -#include #include -#include +#include +#define LOG_TAG "AHAL_DownmixSw" #include #include diff --git a/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp b/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp index 5e5c974980..1dda6d1183 100644 --- a/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp +++ b/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.cpp @@ -14,13 +14,12 @@ * limitations under the License. */ -#include -#define LOG_TAG "AHAL_DynamicsProcessingSw" -#include #include +#include #include #include +#define LOG_TAG "AHAL_DynamicsProcessingSw" #include #include @@ -282,8 +281,8 @@ IEffect::Status DynamicsProcessingSw::effectProcessImpl(float* in, float* out, i RetCode DynamicsProcessingSwContext::setCommon(const Parameter::Common& common) { mCommon = common; - mChannelCount = - ::android::hardware::audio::common::getChannelCount(common.input.base.channelMask); + mChannelCount = ::aidl::android::hardware::audio::common::getChannelCount( + common.input.base.channelMask); resizeChannels(); resizeBands(); LOG(INFO) << __func__ << mCommon.toString(); diff --git a/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.h b/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.h index 3e14ccedf9..769f9ef14f 100644 --- a/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.h +++ b/audio/aidl/default/dynamicProcessing/DynamicsProcessingSw.h @@ -16,10 +16,13 @@ #pragma once -#include -#include #include #include +#include + +#include +#include +#include #include "effect-impl/EffectImpl.h" #include "effect-impl/EffectUUID.h" @@ -30,7 +33,7 @@ class DynamicsProcessingSwContext final : public EffectContext { public: DynamicsProcessingSwContext(int statusDepth, const Parameter::Common& common) : EffectContext(statusDepth, common), - mChannelCount(::android::hardware::audio::common::getChannelCount( + mChannelCount(::aidl::android::hardware::audio::common::getChannelCount( common.input.base.channelMask)), mPreEqChCfgs(mChannelCount, {.channel = kInvalidChannelId}), mPostEqChCfgs(mChannelCount, {.channel = kInvalidChannelId}), diff --git a/audio/aidl/default/envReverb/EnvReverbSw.cpp b/audio/aidl/default/envReverb/EnvReverbSw.cpp index 15373fe2fa..29288cacf3 100644 --- a/audio/aidl/default/envReverb/EnvReverbSw.cpp +++ b/audio/aidl/default/envReverb/EnvReverbSw.cpp @@ -14,12 +14,11 @@ * limitations under the License. */ -#include -#define LOG_TAG "AHAL_EnvReverbSw" -#include #include +#include #include +#define LOG_TAG "AHAL_EnvReverbSw" #include #include diff --git a/audio/aidl/default/equalizer/EqualizerSw.cpp b/audio/aidl/default/equalizer/EqualizerSw.cpp index 8cfe82e850..0fa7a11607 100644 --- a/audio/aidl/default/equalizer/EqualizerSw.cpp +++ b/audio/aidl/default/equalizer/EqualizerSw.cpp @@ -14,12 +14,10 @@ * limitations under the License. */ -#include -#define LOG_TAG "AHAL_EqualizerSw" -#include #include -#include +#include +#define LOG_TAG "AHAL_EqualizerSw" #include #include diff --git a/audio/aidl/default/extension/ExtensionEffect.cpp b/audio/aidl/default/extension/ExtensionEffect.cpp index c4e49997ca..db1e4a4bf3 100644 --- a/audio/aidl/default/extension/ExtensionEffect.cpp +++ b/audio/aidl/default/extension/ExtensionEffect.cpp @@ -19,9 +19,8 @@ #include #include -#define LOG_TAG "AHAL_ExtensionEffect" -#include #include +#define LOG_TAG "AHAL_ExtensionEffect" #include #include diff --git a/audio/aidl/default/hapticGenerator/HapticGeneratorSw.cpp b/audio/aidl/default/hapticGenerator/HapticGeneratorSw.cpp index 6037ad2aec..944f715ed3 100644 --- a/audio/aidl/default/hapticGenerator/HapticGeneratorSw.cpp +++ b/audio/aidl/default/hapticGenerator/HapticGeneratorSw.cpp @@ -14,12 +14,10 @@ * limitations under the License. */ -#include -#define LOG_TAG "AHAL_HapticGeneratorSw" -#include #include -#include +#include +#define LOG_TAG "AHAL_HapticGeneratorSw" #include #include diff --git a/audio/aidl/default/include/effect-impl/EffectContext.h b/audio/aidl/default/include/effect-impl/EffectContext.h index 2ab0ade4dd..8b4a7d2c0d 100644 --- a/audio/aidl/default/include/effect-impl/EffectContext.h +++ b/audio/aidl/default/include/effect-impl/EffectContext.h @@ -15,10 +15,10 @@ */ #pragma once -#include #include #include +#include #include #include @@ -46,9 +46,9 @@ class EffectContext { LOG_ALWAYS_FATAL_IF(output.base.format.pcm != aidl::android::media::audio::common::PcmType::FLOAT_32_BIT, "outputFormatNotFloat"); - mInputFrameSize = ::android::hardware::audio::common::getFrameSizeInBytes( + mInputFrameSize = ::aidl::android::hardware::audio::common::getFrameSizeInBytes( input.base.format, input.base.channelMask); - mOutputFrameSize = ::android::hardware::audio::common::getFrameSizeInBytes( + mOutputFrameSize = ::aidl::android::hardware::audio::common::getFrameSizeInBytes( output.base.format, output.base.channelMask); // in/outBuffer size in float (FMQ data format defined for DataMQ) size_t inBufferSizeInFloat = input.frameCount * mInputFrameSize / sizeof(float); diff --git a/audio/aidl/default/loudnessEnhancer/LoudnessEnhancerSw.cpp b/audio/aidl/default/loudnessEnhancer/LoudnessEnhancerSw.cpp index da020760e1..f115cc51d2 100644 --- a/audio/aidl/default/loudnessEnhancer/LoudnessEnhancerSw.cpp +++ b/audio/aidl/default/loudnessEnhancer/LoudnessEnhancerSw.cpp @@ -14,12 +14,10 @@ * limitations under the License. */ -#include -#define LOG_TAG "AHAL_LoudnessEnhancerSw" -#include #include -#include +#include +#define LOG_TAG "AHAL_LoudnessEnhancerSw" #include #include diff --git a/audio/aidl/default/noiseSuppression/NoiseSuppressionSw.cpp b/audio/aidl/default/noiseSuppression/NoiseSuppressionSw.cpp index 0ea31ea62c..ba39b16217 100644 --- a/audio/aidl/default/noiseSuppression/NoiseSuppressionSw.cpp +++ b/audio/aidl/default/noiseSuppression/NoiseSuppressionSw.cpp @@ -17,10 +17,8 @@ #include #include #include -#define LOG_TAG "AHAL_NoiseSuppressionSw" -#include -#include +#define LOG_TAG "AHAL_NoiseSuppressionSw" #include #include diff --git a/audio/aidl/default/presetReverb/PresetReverbSw.cpp b/audio/aidl/default/presetReverb/PresetReverbSw.cpp index 2da3ff6ded..14546a4a9e 100644 --- a/audio/aidl/default/presetReverb/PresetReverbSw.cpp +++ b/audio/aidl/default/presetReverb/PresetReverbSw.cpp @@ -14,12 +14,10 @@ * limitations under the License. */ -#include -#define LOG_TAG "AHAL_PresetReverbSw" -#include #include -#include +#include +#define LOG_TAG "AHAL_PresetReverbSw" #include #include #include diff --git a/audio/aidl/default/usb/ModuleUsb.cpp b/audio/aidl/default/usb/ModuleUsb.cpp index 511ba74e91..80b0a5bb2d 100644 --- a/audio/aidl/default/usb/ModuleUsb.cpp +++ b/audio/aidl/default/usb/ModuleUsb.cpp @@ -30,6 +30,7 @@ extern "C" { #include "alsa_device_profile.h" } +using aidl::android::hardware::audio::common::isUsbInputDeviceType; using aidl::android::media::audio::common::AudioChannelLayout; using aidl::android::media::audio::common::AudioDeviceAddress; using aidl::android::media::audio::common::AudioDeviceDescription; @@ -40,7 +41,6 @@ using aidl::android::media::audio::common::AudioPort; using aidl::android::media::audio::common::AudioPortConfig; using aidl::android::media::audio::common::AudioPortExt; using aidl::android::media::audio::common::AudioProfile; -using android::hardware::audio::common::isUsbInputDeviceType; namespace aidl::android::hardware::audio::core { diff --git a/audio/aidl/default/usb/StreamUsb.cpp b/audio/aidl/default/usb/StreamUsb.cpp index d6f757c7a9..fbfe0f11de 100644 --- a/audio/aidl/default/usb/StreamUsb.cpp +++ b/audio/aidl/default/usb/StreamUsb.cpp @@ -28,6 +28,7 @@ extern "C" { #include "alsa_device_profile.h" } +using aidl::android::hardware::audio::common::getChannelCount; using aidl::android::hardware::audio::common::SinkMetadata; using aidl::android::hardware::audio::common::SourceMetadata; using aidl::android::media::audio::common::AudioDevice; @@ -38,7 +39,6 @@ using aidl::android::media::audio::common::MicrophoneDynamicInfo; using aidl::android::media::audio::common::MicrophoneInfo; using android::OK; using android::status_t; -using android::hardware::audio::common::getChannelCount; namespace aidl::android::hardware::audio::core { diff --git a/audio/aidl/default/usb/UsbAlsaUtils.cpp b/audio/aidl/default/usb/UsbAlsaUtils.cpp index 3c79e1dfc0..3a74c2ae49 100644 --- a/audio/aidl/default/usb/UsbAlsaUtils.cpp +++ b/audio/aidl/default/usb/UsbAlsaUtils.cpp @@ -24,11 +24,11 @@ #include "UsbAlsaUtils.h" #include "core-impl/utils.h" +using aidl::android::hardware::audio::common::getChannelCount; using aidl::android::media::audio::common::AudioChannelLayout; using aidl::android::media::audio::common::AudioFormatDescription; using aidl::android::media::audio::common::AudioFormatType; using aidl::android::media::audio::common::PcmType; -using android::hardware::audio::common::getChannelCount; namespace aidl::android::hardware::audio::core::usb { @@ -178,4 +178,4 @@ pcm_format aidl2legacy_AudioFormatDescription_pcm_format(const AudioFormatDescri return findValueOrDefault(getAudioFormatDescriptorToPcmFormatMap(), aidl, PCM_FORMAT_INVALID); } -} // namespace aidl::android::hardware::audio::core::usb \ No newline at end of file +} // namespace aidl::android::hardware::audio::core::usb diff --git a/audio/aidl/default/virtualizer/VirtualizerSw.cpp b/audio/aidl/default/virtualizer/VirtualizerSw.cpp index d75e4e0e64..c5a0e8d335 100644 --- a/audio/aidl/default/virtualizer/VirtualizerSw.cpp +++ b/audio/aidl/default/virtualizer/VirtualizerSw.cpp @@ -14,12 +14,11 @@ * limitations under the License. */ +#include #include + #define LOG_TAG "AHAL_VirtualizerSw" #include -#include -#include - #include #include @@ -170,7 +169,7 @@ ndk::ScopedAStatus VirtualizerSw::getParameterVirtualizer(const Virtualizer::Tag ndk::ScopedAStatus VirtualizerSw::getSpeakerAngles(const Virtualizer::SpeakerAnglesPayload payload, Parameter::Specific* specific) { std::vector angles; - const auto chNum = ::android::hardware::audio::common::getChannelCount(payload.layout); + const auto chNum = ::aidl::android::hardware::audio::common::getChannelCount(payload.layout); if (chNum == 1) { angles = {{.channel = (int32_t)AudioChannelLayout::CHANNEL_FRONT_LEFT, .azimuthDegree = 0, diff --git a/audio/aidl/default/volume/VolumeSw.cpp b/audio/aidl/default/volume/VolumeSw.cpp index 796c332b9b..44cac446ba 100644 --- a/audio/aidl/default/volume/VolumeSw.cpp +++ b/audio/aidl/default/volume/VolumeSw.cpp @@ -14,12 +14,10 @@ * limitations under the License. */ -#include -#define LOG_TAG "AHAL_VolumeSw" -#include #include -#include +#include +#define LOG_TAG "AHAL_VolumeSw" #include #include diff --git a/audio/aidl/vts/EffectHelper.h b/audio/aidl/vts/EffectHelper.h index 5e03d6715b..a128f7c050 100644 --- a/audio/aidl/vts/EffectHelper.h +++ b/audio/aidl/vts/EffectHelper.h @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -135,7 +136,7 @@ class EffectHelper { static void allocateInputData(const Parameter::Common common, std::unique_ptr& mq, std::vector& buffer) { ASSERT_NE(mq, nullptr); - auto frameSize = android::hardware::audio::common::getFrameSizeInBytes( + auto frameSize = ::aidl::android::hardware::audio::common::getFrameSizeInBytes( common.input.base.format, common.input.base.channelMask); const size_t floatsToWrite = mq->availableToWrite(); ASSERT_NE(0UL, floatsToWrite); diff --git a/audio/aidl/vts/ModuleConfig.cpp b/audio/aidl/vts/ModuleConfig.cpp index b07edb7665..8c448a805e 100644 --- a/audio/aidl/vts/ModuleConfig.cpp +++ b/audio/aidl/vts/ModuleConfig.cpp @@ -27,6 +27,7 @@ using namespace android; using namespace std::chrono_literals; +using aidl::android::hardware::audio::common::isBitPositionFlagSet; using aidl::android::hardware::audio::core::IModule; using aidl::android::media::audio::common::AudioChannelLayout; using aidl::android::media::audio::common::AudioDeviceType; @@ -43,7 +44,6 @@ using aidl::android::media::audio::common::AudioPortExt; using aidl::android::media::audio::common::AudioProfile; using aidl::android::media::audio::common::AudioUsage; using aidl::android::media::audio::common::Int; -using android::hardware::audio::common::isBitPositionFlagSet; // static std::optional ModuleConfig::generateOffloadInfoIfNeeded( diff --git a/audio/aidl/vts/VtsHalAECTargetTest.cpp b/audio/aidl/vts/VtsHalAECTargetTest.cpp index 39be191067..2d36cbb181 100644 --- a/audio/aidl/vts/VtsHalAECTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAECTargetTest.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include -#include #include #include #include +#include #define LOG_TAG "VtsHalAECParamTest" +#include #include "EffectHelper.h" #include "effect-impl/EffectTypes.h" @@ -177,4 +177,4 @@ int main(int argc, char** argv) { ABinderProcess_setThreadPoolMaxThreadCount(1); ABinderProcess_startThreadPool(); return RUN_ALL_TESTS(); -} \ No newline at end of file +} diff --git a/audio/aidl/vts/VtsHalAGC1TargetTest.cpp b/audio/aidl/vts/VtsHalAGC1TargetTest.cpp index a6fc1aa0e8..15a9374352 100644 --- a/audio/aidl/vts/VtsHalAGC1TargetTest.cpp +++ b/audio/aidl/vts/VtsHalAGC1TargetTest.cpp @@ -14,10 +14,9 @@ * limitations under the License. */ -#include #include - #define LOG_TAG "VtsHalAGC1ParamTest" +#include #include "EffectHelper.h" diff --git a/audio/aidl/vts/VtsHalAGC2TargetTest.cpp b/audio/aidl/vts/VtsHalAGC2TargetTest.cpp index fd3a866006..140537e67e 100644 --- a/audio/aidl/vts/VtsHalAGC2TargetTest.cpp +++ b/audio/aidl/vts/VtsHalAGC2TargetTest.cpp @@ -14,12 +14,10 @@ * limitations under the License. */ -#include #include -#include -#include - #define LOG_TAG "VtsHalAGC2ParamTest" +#include +#include #include "EffectHelper.h" @@ -200,4 +198,4 @@ int main(int argc, char** argv) { ABinderProcess_setThreadPoolMaxThreadCount(1); ABinderProcess_startThreadPool(); return RUN_ALL_TESTS(); -} \ No newline at end of file +} diff --git a/audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp b/audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp index e7f581701f..e5e06ebce2 100644 --- a/audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp @@ -1,17 +1,32 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include #include #include #include #include -#define LOG_TAG "VtsHalAudioCore.Config" - -#include #include #include #include #include #include +#define LOG_TAG "VtsHalAudioCore.Config" +#include #include "AudioHalBinderServiceUtil.h" #include "TestUtils.h" diff --git a/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp b/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp index 650a543688..bd04de71fc 100644 --- a/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp @@ -54,6 +54,10 @@ using namespace android; using aidl::android::hardware::audio::common::AudioOffloadMetadata; +using aidl::android::hardware::audio::common::getChannelCount; +using aidl::android::hardware::audio::common::isBitPositionFlagSet; +using aidl::android::hardware::audio::common::isTelephonyDeviceType; +using aidl::android::hardware::audio::common::isValidAudioMode; using aidl::android::hardware::audio::common::PlaybackTrackMetadata; using aidl::android::hardware::audio::common::RecordTrackMetadata; using aidl::android::hardware::audio::common::SinkMetadata; @@ -100,10 +104,6 @@ using aidl::android::media::audio::common::Int; using aidl::android::media::audio::common::MicrophoneDynamicInfo; using aidl::android::media::audio::common::MicrophoneInfo; using aidl::android::media::audio::common::Void; -using android::hardware::audio::common::getChannelCount; -using android::hardware::audio::common::isBitPositionFlagSet; -using android::hardware::audio::common::isTelephonyDeviceType; -using android::hardware::audio::common::isValidAudioMode; using android::hardware::audio::common::StreamLogic; using android::hardware::audio::common::StreamWorker; using ndk::enum_range; diff --git a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp index 947d30ed8d..df66bd3a6c 100644 --- a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp @@ -21,7 +21,6 @@ #include #include -#include #include #include #include diff --git a/audio/aidl/vts/VtsHalBassBoostTargetTest.cpp b/audio/aidl/vts/VtsHalBassBoostTargetTest.cpp index a1862d21ac..824bd9f2de 100644 --- a/audio/aidl/vts/VtsHalBassBoostTargetTest.cpp +++ b/audio/aidl/vts/VtsHalBassBoostTargetTest.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#define LOG_TAG "VtsHalBassBoostTest" - -#include -#include #include +#include +#define LOG_TAG "VtsHalBassBoostTest" +#include + #include "EffectHelper.h" using namespace android; diff --git a/audio/aidl/vts/VtsHalDownmixTargetTest.cpp b/audio/aidl/vts/VtsHalDownmixTargetTest.cpp index 0601cc4e1e..bd3b76bba3 100644 --- a/audio/aidl/vts/VtsHalDownmixTargetTest.cpp +++ b/audio/aidl/vts/VtsHalDownmixTargetTest.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#define LOG_TAG "VtsHalDownmixTargetTest" - -#include #include +#define LOG_TAG "VtsHalDownmixTargetTest" +#include + #include "EffectHelper.h" using namespace android; diff --git a/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp b/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp index 3e6fa7a7c2..0b05b17e61 100644 --- a/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp +++ b/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include - -#define LOG_TAG "VtsHalDynamicsProcessingTest" - #include #include -#include #include +#include +#define LOG_TAG "VtsHalDynamicsProcessingTest" +#include + #include + #include "EffectHelper.h" using namespace android; @@ -45,7 +45,7 @@ class DynamicsProcessingTestHelper : public EffectHelper { int32_t channelLayOut = AudioChannelLayout::LAYOUT_STEREO) { std::tie(mFactory, mDescriptor) = pair; mChannelLayout = channelLayOut; - mChannelCount = ::android::hardware::audio::common::getChannelCount( + mChannelCount = ::aidl::android::hardware::audio::common::getChannelCount( AudioChannelLayout::make(mChannelLayout)); } diff --git a/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp b/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp index fea41cb954..a2deb7ca7c 100644 --- a/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp +++ b/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp @@ -14,11 +14,10 @@ * limitations under the License. */ -#define LOG_TAG "VtsHalEnvironmentalReverbTest" - -#include #include -#include +#define LOG_TAG "VtsHalEnvironmentalReverbTest" +#include + #include "EffectHelper.h" using namespace android; diff --git a/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp b/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp index 54d00a71d6..9beb0a7210 100644 --- a/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp @@ -22,10 +22,11 @@ #include #include -#define LOG_TAG "VtsHalEqualizerTest" - #include #include +#include +#include +#define LOG_TAG "VtsHalEqualizerTest" #include #include #include @@ -33,10 +34,6 @@ #include #include -#include -#include -#include - #include "AudioHalBinderServiceUtil.h" #include "EffectHelper.h" #include "TestUtils.h" diff --git a/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp b/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp index 6c3016e903..32ebc4f11c 100644 --- a/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp +++ b/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#define LOG_TAG "VtsHalHapticGeneratorTargetTest" - -#include -#include -#include #include #include #include +#include +#define LOG_TAG "VtsHalHapticGeneratorTargetTest" +#include +#include + #include "EffectHelper.h" using namespace android; diff --git a/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp b/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp index 75941ff267..5faf7f41e6 100644 --- a/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include #include +#include #define LOG_TAG "VtsHalLoudnessEnhancerTest" +#include -#include #include "EffectHelper.h" using namespace android; diff --git a/audio/aidl/vts/VtsHalNSTargetTest.cpp b/audio/aidl/vts/VtsHalNSTargetTest.cpp index 16c79e3a61..4fcda6b242 100644 --- a/audio/aidl/vts/VtsHalNSTargetTest.cpp +++ b/audio/aidl/vts/VtsHalNSTargetTest.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include -#include -#include #include -#define LOG_TAG "VtsHalNSParamTest" - +#include #include +#define LOG_TAG "VtsHalNSParamTest" +#include +#include + #include "EffectHelper.h" using namespace android; @@ -171,4 +171,4 @@ int main(int argc, char** argv) { ABinderProcess_setThreadPoolMaxThreadCount(1); ABinderProcess_startThreadPool(); return RUN_ALL_TESTS(); -} \ No newline at end of file +} diff --git a/audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp b/audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp index c9c2a315e3..7bce9c36ff 100644 --- a/audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp +++ b/audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#define LOG_TAG "VtsHalPresetReverbTargetTest" - -#include #include +#define LOG_TAG "VtsHalPresetReverbTargetTest" +#include #include + #include "EffectHelper.h" using namespace android; diff --git a/audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp b/audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp index 8b0210cc53..84b980f6d5 100644 --- a/audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#define LOG_TAG "VtsHalVirtualizerTest" - -#include #include +#define LOG_TAG "VtsHalVirtualizerTest" +#include + #include "EffectHelper.h" using namespace android; diff --git a/audio/aidl/vts/VtsHalVisualizerTargetTest.cpp b/audio/aidl/vts/VtsHalVisualizerTargetTest.cpp index e2625cb1c4..e273824fbd 100644 --- a/audio/aidl/vts/VtsHalVisualizerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalVisualizerTargetTest.cpp @@ -14,14 +14,13 @@ * limitations under the License. */ -#include - -#define LOG_TAG "VtsHalVisualizerTest" - -#include -#include #include +#include +#define LOG_TAG "VtsHalVisualizerTest" +#include +#include + #include "EffectHelper.h" using namespace android; @@ -213,4 +212,4 @@ int main(int argc, char** argv) { ABinderProcess_setThreadPoolMaxThreadCount(1); ABinderProcess_startThreadPool(); return RUN_ALL_TESTS(); -} \ No newline at end of file +} diff --git a/audio/aidl/vts/VtsHalVolumeTargetTest.cpp b/audio/aidl/vts/VtsHalVolumeTargetTest.cpp index 44ce1464ab..fbd10a83bf 100644 --- a/audio/aidl/vts/VtsHalVolumeTargetTest.cpp +++ b/audio/aidl/vts/VtsHalVolumeTargetTest.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#define LOG_TAG "VtsHalVolumeTest" - -#include #include +#define LOG_TAG "VtsHalVolumeTest" +#include + #include "EffectHelper.h" using namespace android;