Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21116128 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Format VTS test code" am: e0ade8fe am: 1e58a2b6 am: 7f651d40 am:... 

Merge "Format VTS test code" am: e0ade8fe am: 1e58a2b6 am: 7f651d40 am: b68ed1a3 am: 9fd342b4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2636889



Change-Id: Ifc810b328a981f80eddbe1438973d21d4ab68d26
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed250aca 9fd342b4

audio/aidl/vts/EffectHelper.h

+4 −5
Original line number Diff line number Diff line
@@ -30,16 +30,15 @@ 
#include <android/binder_auto_utils.h>

#include <fmq/AidlMessageQueue.h>

#include <gtest/gtest.h>

#include <system/audio_aidl_utils.h>

#include <system/audio_effects/aidl_effects_utils.h>

#include <system/audio_effects/effect_uuid.h>

#include <system/audio_aidl_utils.h>



#include "AudioHalBinderServiceUtil.h"

#include "EffectFactoryHelper.h"

#include "TestUtils.h"



using namespace android;

using ::android::audio::utils::toString;

using aidl::android::hardware::audio::effect::CommandId;

using aidl::android::hardware::audio::effect::Descriptor;

using aidl::android::hardware::audio::effect::IEffect;
@@ -53,6 +52,7 @@ using aidl::android::media::audio::common::AudioFormatDescription; 
using aidl::android::media::audio::common::AudioFormatType;

using aidl::android::media::audio::common::AudioUuid;

using aidl::android::media::audio::common::PcmType;

using ::android::audio::utils::toString;

using ::android::hardware::EventFlag;



const AudioFormatDescription kDefaultFormatDescription = {
@@ -67,8 +67,7 @@ typedef ::android::AidlMessageQueue<float, 


static inline std::string getPrefix(Descriptor& descriptor) {

    std::string prefix = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               toString(descriptor.common.id.uuid);

                         descriptor.common.name + "_UUID_" + toString(descriptor.common.id.uuid);

    return prefix;

}

audio/aidl/vts/VtsHalAECTargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ INSTANTIATE_TEST_SUITE_P( 
            auto descriptor = std::get<PARAM_INSTANCE_NAME>(info.param).second;

            std::string echoDelay = std::to_string(std::get<PARAM_ECHO_DELAY>(info.param));

            std::string mobileMode = std::get<PARAM_MOBILE_MODE>(info.param) ? "true" : "false";

            std::string name = getPrefix(descriptor) + "_EchoDelay_" + echoDelay +

                               "_MobileMode_" + mobileMode;

            std::string name =

                    getPrefix(descriptor) + "_EchoDelay_" + echoDelay + "_MobileMode_" + mobileMode;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;

audio/aidl/vts/VtsHalAGC1TargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -177,9 +177,9 @@ INSTANTIATE_TEST_SUITE_P( 
                    std::to_string(std::get<PARAM_MAX_COMPRESSION_GAIN>(info.param));

            std::string enableLimiter = std::to_string(std::get<PARAM_ENABLE_LIMITER>(info.param));



            std::string name = getPrefix(descriptor) + "_target_peak_level_" +

                               targetPeakLevel + "_max_compression_gain_" + maxCompressionGain +

                               "_enable_limiter_" + enableLimiter;

            std::string name = getPrefix(descriptor) + "_target_peak_level_" + targetPeakLevel +

                               "_max_compression_gain_" + maxCompressionGain + "_enable_limiter_" +

                               enableLimiter;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;

audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -195,10 +195,10 @@ INSTANTIATE_TEST_SUITE_P( 
                    std::to_string(std::get<PARAM_VIBRATION_INFORMATION_Q_FACTOR>(info.param));

            std::string maxAmplitude =

                    std::to_string(std::get<PARAM_VIBRATION_INFORMATION_MAX_AMPLITUDE>(info.param));

            std::string name = getPrefix(descriptor) + "_hapticScaleId" +

                               hapticScaleID + "_hapticScaleVibScale" + hapticScaleVibScale +

                               "_resonantFrequency" + resonantFrequency + "_qFactor" + qFactor +

                               "_maxAmplitude" + maxAmplitude;

            std::string name = getPrefix(descriptor) + "_hapticScaleId" + hapticScaleID +

                               "_hapticScaleVibScale" + hapticScaleVibScale + "_resonantFrequency" +

                               resonantFrequency + "_qFactor" + qFactor + "_maxAmplitude" +

                               maxAmplitude;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;

audio/aidl/vts/VtsHalNSTargetTest.cpp

+1 −2
Original line number Diff line number Diff line
@@ -155,8 +155,7 @@ INSTANTIATE_TEST_SUITE_P( 
                    std::get<PARAM_LEVEL>(info.param));

            std::string type = aidl::android::hardware::audio::effect::toString(

                    std::get<PARAM_TYPE>(info.param));

            std::string name = getPrefix(descriptor) + "_level_" + level + "_type_" +

                               type;

            std::string name = getPrefix(descriptor) + "_level_" + level + "_type_" + type;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;