Merge "audio: Put audio/aidl/common/include/Utils.h into 'aidl' NS" am: 7260130baf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2480537 Change-Id: If989453ea55808d193adca90d73b779605376831 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
99e5af4b2f
45 changed files with 130 additions and 143 deletions
|
@ -30,7 +30,7 @@
|
|||
#include <aidl/android/media/audio/common/AudioOutputFlags.h>
|
||||
#include <aidl/android/media/audio/common/PcmType.h>
|
||||
|
||||
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<E> flags) {
|
|||
return result;
|
||||
}
|
||||
|
||||
} // namespace android::hardware::audio::common
|
||||
} // namespace aidl::android::hardware::audio::common
|
||||
|
|
|
@ -26,13 +26,13 @@
|
|||
#define LOG_TAG "Utils_Test"
|
||||
#include <log/log.h>
|
||||
|
||||
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;
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -17,10 +17,9 @@
|
|||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
#include <memory>
|
||||
#define LOG_TAG "AHAL_AcousticEchoCancelerSw"
|
||||
#include <Utils.h>
|
||||
#include <unordered_set>
|
||||
|
||||
#define LOG_TAG "AHAL_AcousticEchoCancelerSw"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
|
|
@ -17,10 +17,8 @@
|
|||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
#include <memory>
|
||||
#define LOG_TAG "AHAL_AutomaticGainControlV2Sw"
|
||||
#include <Utils.h>
|
||||
#include <unordered_set>
|
||||
|
||||
#define LOG_TAG "AHAL_AutomaticGainControlV2Sw"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
|
|
@ -17,10 +17,8 @@
|
|||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
#include <memory>
|
||||
#define LOG_TAG "AHAL_BassBoostSw"
|
||||
#include <Utils.h>
|
||||
#include <unordered_set>
|
||||
|
||||
#define LOG_TAG "AHAL_BassBoostSw"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
|
|
@ -14,12 +14,10 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <cstddef>
|
||||
#define LOG_TAG "AHAL_DownmixSw"
|
||||
#include <Utils.h>
|
||||
#include <algorithm>
|
||||
#include <unordered_set>
|
||||
#include <cstddef>
|
||||
|
||||
#define LOG_TAG "AHAL_DownmixSw"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
|
|
@ -14,13 +14,12 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <cstddef>
|
||||
#define LOG_TAG "AHAL_DynamicsProcessingSw"
|
||||
#include <Utils.h>
|
||||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
#include <set>
|
||||
#include <unordered_set>
|
||||
|
||||
#define LOG_TAG "AHAL_DynamicsProcessingSw"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
@ -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();
|
||||
|
|
|
@ -16,10 +16,13 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <aidl/android/hardware/audio/effect/BnEffect.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
#include <cstdlib>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/android/hardware/audio/effect/BnEffect.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
#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}),
|
||||
|
|
|
@ -14,12 +14,11 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <cstddef>
|
||||
#define LOG_TAG "AHAL_EnvReverbSw"
|
||||
#include <Utils.h>
|
||||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
#include <unordered_set>
|
||||
|
||||
#define LOG_TAG "AHAL_EnvReverbSw"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
|
|
@ -14,12 +14,10 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <cstddef>
|
||||
#define LOG_TAG "AHAL_EqualizerSw"
|
||||
#include <Utils.h>
|
||||
#include <algorithm>
|
||||
#include <unordered_set>
|
||||
#include <cstddef>
|
||||
|
||||
#define LOG_TAG "AHAL_EqualizerSw"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
|
|
@ -19,9 +19,8 @@
|
|||
#include <memory>
|
||||
#include <unordered_set>
|
||||
|
||||
#define LOG_TAG "AHAL_ExtensionEffect"
|
||||
#include <Utils.h>
|
||||
#include <aidl/android/hardware/audio/effect/DefaultExtension.h>
|
||||
#define LOG_TAG "AHAL_ExtensionEffect"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
|
|
@ -14,12 +14,10 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <cstddef>
|
||||
#define LOG_TAG "AHAL_HapticGeneratorSw"
|
||||
#include <Utils.h>
|
||||
#include <algorithm>
|
||||
#include <unordered_set>
|
||||
#include <cstddef>
|
||||
|
||||
#define LOG_TAG "AHAL_HapticGeneratorSw"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
|
|
@ -15,10 +15,10 @@
|
|||
*/
|
||||
|
||||
#pragma once
|
||||
#include <Utils.h>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <Utils.h>
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
@ -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);
|
||||
|
|
|
@ -14,12 +14,10 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <cstddef>
|
||||
#define LOG_TAG "AHAL_LoudnessEnhancerSw"
|
||||
#include <Utils.h>
|
||||
#include <algorithm>
|
||||
#include <unordered_set>
|
||||
#include <cstddef>
|
||||
|
||||
#define LOG_TAG "AHAL_LoudnessEnhancerSw"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
|
|
@ -17,10 +17,8 @@
|
|||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
#include <memory>
|
||||
#define LOG_TAG "AHAL_NoiseSuppressionSw"
|
||||
#include <Utils.h>
|
||||
#include <unordered_set>
|
||||
|
||||
#define LOG_TAG "AHAL_NoiseSuppressionSw"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
|
|
@ -14,12 +14,10 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <cstddef>
|
||||
#define LOG_TAG "AHAL_PresetReverbSw"
|
||||
#include <Utils.h>
|
||||
#include <algorithm>
|
||||
#include <unordered_set>
|
||||
#include <cstddef>
|
||||
|
||||
#define LOG_TAG "AHAL_PresetReverbSw"
|
||||
#include <android-base/logging.h>
|
||||
#include <android/binder_enums.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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
|
||||
} // namespace aidl::android::hardware::audio::core::usb
|
||||
|
|
|
@ -14,12 +14,11 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
|
||||
#define LOG_TAG "AHAL_VirtualizerSw"
|
||||
#include <Utils.h>
|
||||
#include <algorithm>
|
||||
#include <unordered_set>
|
||||
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
@ -170,7 +169,7 @@ ndk::ScopedAStatus VirtualizerSw::getParameterVirtualizer(const Virtualizer::Tag
|
|||
ndk::ScopedAStatus VirtualizerSw::getSpeakerAngles(const Virtualizer::SpeakerAnglesPayload payload,
|
||||
Parameter::Specific* specific) {
|
||||
std::vector<Virtualizer::ChannelAngle> 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,
|
||||
|
|
|
@ -14,12 +14,10 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <cstddef>
|
||||
#define LOG_TAG "AHAL_VolumeSw"
|
||||
#include <Utils.h>
|
||||
#include <algorithm>
|
||||
#include <unordered_set>
|
||||
#include <cstddef>
|
||||
|
||||
#define LOG_TAG "AHAL_VolumeSw"
|
||||
#include <android-base/logging.h>
|
||||
#include <fmq/AidlMessageQueue.h>
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/android/hardware/audio/effect/IEffect.h>
|
||||
#include <aidl/android/hardware/audio/effect/IFactory.h>
|
||||
#include <aidl/android/media/audio/common/AudioChannelLayout.h>
|
||||
|
@ -135,7 +136,7 @@ class EffectHelper {
|
|||
static void allocateInputData(const Parameter::Common common, std::unique_ptr<DataMQ>& mq,
|
||||
std::vector<float>& 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);
|
||||
|
|
|
@ -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<AudioOffloadInfo> ModuleConfig::generateOffloadInfoIfNeeded(
|
||||
|
|
|
@ -14,13 +14,13 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
#include <unordered_set>
|
||||
|
||||
#include <aidl/Vintf.h>
|
||||
#define LOG_TAG "VtsHalAECParamTest"
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,10 +14,9 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Vintf.h>
|
||||
|
||||
#define LOG_TAG "VtsHalAGC1ParamTest"
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#include "EffectHelper.h"
|
||||
|
||||
|
|
|
@ -14,12 +14,10 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#include <android/binder_enums.h>
|
||||
#include <unordered_set>
|
||||
|
||||
#define LOG_TAG "VtsHalAGC2ParamTest"
|
||||
#include <android-base/logging.h>
|
||||
#include <android/binder_enums.h>
|
||||
|
||||
#include "EffectHelper.h"
|
||||
|
||||
|
@ -200,4 +198,4 @@ int main(int argc, char** argv) {
|
|||
ABinderProcess_setThreadPoolMaxThreadCount(1);
|
||||
ABinderProcess_startThreadPool();
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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 <set>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
|
||||
#define LOG_TAG "VtsHalAudioCore.Config"
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Gtest.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#include <aidl/android/hardware/audio/core/IConfig.h>
|
||||
#include <aidl/android/media/audio/common/AudioFlag.h>
|
||||
#include <aidl/android/media/audio/common/AudioProductStrategyType.h>
|
||||
#define LOG_TAG "VtsHalAudioCore.Config"
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#include "AudioHalBinderServiceUtil.h"
|
||||
#include "TestUtils.h"
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Gtest.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#include <aidl/android/hardware/audio/effect/IEffect.h>
|
||||
|
|
|
@ -14,12 +14,12 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#define LOG_TAG "VtsHalBassBoostTest"
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include <aidl/Vintf.h>
|
||||
#define LOG_TAG "VtsHalBassBoostTest"
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#include "EffectHelper.h"
|
||||
|
||||
using namespace android;
|
||||
|
|
|
@ -14,10 +14,10 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#define LOG_TAG "VtsHalDownmixTargetTest"
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#define LOG_TAG "VtsHalDownmixTargetTest"
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#include "EffectHelper.h"
|
||||
|
||||
using namespace android;
|
||||
|
|
|
@ -14,16 +14,16 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <aidl/Vintf.h>
|
||||
|
||||
#define LOG_TAG "VtsHalDynamicsProcessingTest"
|
||||
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
|
||||
#include <aidl/Vintf.h>
|
||||
#define LOG_TAG "VtsHalDynamicsProcessingTest"
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#include <Utils.h>
|
||||
|
||||
#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<AudioChannelLayout::layoutMask>(mChannelLayout));
|
||||
}
|
||||
|
||||
|
|
|
@ -14,11 +14,10 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#define LOG_TAG "VtsHalEnvironmentalReverbTest"
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#include <unordered_set>
|
||||
#define LOG_TAG "VtsHalEnvironmentalReverbTest"
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#include "EffectHelper.h"
|
||||
|
||||
using namespace android;
|
||||
|
|
|
@ -22,10 +22,11 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#define LOG_TAG "VtsHalEqualizerTest"
|
||||
|
||||
#include <aidl/Gtest.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#include <aidl/android/hardware/audio/effect/IEffect.h>
|
||||
#include <aidl/android/hardware/audio/effect/IFactory.h>
|
||||
#define LOG_TAG "VtsHalEqualizerTest"
|
||||
#include <android-base/logging.h>
|
||||
#include <android-base/properties.h>
|
||||
#include <android/binder_interface_utils.h>
|
||||
|
@ -33,10 +34,6 @@
|
|||
#include <android/binder_process.h>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/android/hardware/audio/effect/IEffect.h>
|
||||
#include <aidl/android/hardware/audio/effect/IFactory.h>
|
||||
|
||||
#include "AudioHalBinderServiceUtil.h"
|
||||
#include "EffectHelper.h"
|
||||
#include "TestUtils.h"
|
||||
|
|
|
@ -14,15 +14,15 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#define LOG_TAG "VtsHalHapticGeneratorTargetTest"
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#include <android/binder_enums.h>
|
||||
#include <map>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include <aidl/Vintf.h>
|
||||
#define LOG_TAG "VtsHalHapticGeneratorTargetTest"
|
||||
#include <android-base/logging.h>
|
||||
#include <android/binder_enums.h>
|
||||
|
||||
#include "EffectHelper.h"
|
||||
|
||||
using namespace android;
|
||||
|
|
|
@ -14,12 +14,12 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <aidl/Vintf.h>
|
||||
#include <string>
|
||||
|
||||
#include <aidl/Vintf.h>
|
||||
#define LOG_TAG "VtsHalLoudnessEnhancerTest"
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#include <Utils.h>
|
||||
#include "EffectHelper.h"
|
||||
|
||||
using namespace android;
|
||||
|
|
|
@ -14,14 +14,14 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#include <android/binder_enums.h>
|
||||
#include <unordered_set>
|
||||
|
||||
#define LOG_TAG "VtsHalNSParamTest"
|
||||
|
||||
#include <aidl/Vintf.h>
|
||||
#include <aidl/android/hardware/audio/effect/NoiseSuppression.h>
|
||||
#define LOG_TAG "VtsHalNSParamTest"
|
||||
#include <android-base/logging.h>
|
||||
#include <android/binder_enums.h>
|
||||
|
||||
#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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,11 +14,11 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#define LOG_TAG "VtsHalPresetReverbTargetTest"
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#define LOG_TAG "VtsHalPresetReverbTargetTest"
|
||||
#include <android-base/logging.h>
|
||||
#include <android/binder_enums.h>
|
||||
|
||||
#include "EffectHelper.h"
|
||||
|
||||
using namespace android;
|
||||
|
|
|
@ -14,10 +14,10 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#define LOG_TAG "VtsHalVirtualizerTest"
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#define LOG_TAG "VtsHalVirtualizerTest"
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#include "EffectHelper.h"
|
||||
|
||||
using namespace android;
|
||||
|
|
|
@ -14,14 +14,13 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <aidl/Vintf.h>
|
||||
|
||||
#define LOG_TAG "VtsHalVisualizerTest"
|
||||
|
||||
#include <Utils.h>
|
||||
#include <android/binder_enums.h>
|
||||
#include <unordered_set>
|
||||
|
||||
#include <aidl/Vintf.h>
|
||||
#define LOG_TAG "VtsHalVisualizerTest"
|
||||
#include <android-base/logging.h>
|
||||
#include <android/binder_enums.h>
|
||||
|
||||
#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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,10 +14,10 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#define LOG_TAG "VtsHalVolumeTest"
|
||||
|
||||
#include <Utils.h>
|
||||
#include <aidl/Vintf.h>
|
||||
#define LOG_TAG "VtsHalVolumeTest"
|
||||
#include <android-base/logging.h>
|
||||
|
||||
#include "EffectHelper.h"
|
||||
|
||||
using namespace android;
|
||||
|
|
Loading…
Reference in a new issue