diff --git a/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp b/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp index 3ed9ed20f2..12b17970c3 100644 --- a/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp +++ b/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp @@ -453,12 +453,11 @@ enum EngineArchitectureTestParamName { ENGINE_TEST_INSTANCE_NAME, ENGINE_TEST_RESOLUTION_PREFERENCE, ENGINE_TEST_PREFERRED_DURATION, - ENGINE_TEST_STAGE_ENABLEMENT, - ENGINE_TEST_LIMITER_IN_USE + ENGINE_TEST_STAGE_ENABLEMENT }; using EngineArchitectureTestParams = std::tuple, Descriptor>, DynamicsProcessing::ResolutionPreference, float, - DynamicsProcessing::StageEnablement, bool>; + DynamicsProcessing::StageEnablement>; void fillEngineArchConfig(DynamicsProcessing::EngineArchitecture& cfg, const EngineArchitectureTestParams& params) { @@ -466,7 +465,7 @@ void fillEngineArchConfig(DynamicsProcessing::EngineArchitecture& cfg, cfg.preferredProcessingDurationMs = std::get(params); cfg.preEqStage = cfg.postEqStage = cfg.mbcStage = std::get(params); - cfg.limiterInUse = std::get(params); + cfg.limiterInUse = true; } class DynamicsProcessingTestEngineArchitecture @@ -501,8 +500,8 @@ INSTANTIATE_TEST_SUITE_P( static_cast(-1)), // variant testing::Values(-10.f, 0.f, 10.f), // processing duration testing::ValuesIn( - DynamicsProcessingTestHelper::kStageEnablementTestSet), // preEQ/postEQ/mbc - testing::Bool()), // limiter enable + DynamicsProcessingTestHelper::kStageEnablementTestSet) // preEQ/postEQ/mbc + ), [](const auto& info) { auto descriptor = std::get(info.param).second; DynamicsProcessing::EngineArchitecture cfg; @@ -568,7 +567,6 @@ enum LimiterConfigTestParamName { LIMITER_CHANNEL, LIMITER_ENABLE, LIMITER_LINK_GROUP, - LIMITER_ENGINE_IN_USE, LIMITER_ADDITIONAL, }; enum LimiterConfigTestAdditionalParam { @@ -587,9 +585,8 @@ static constexpr std::array kLimiterConfigTestAd {1, -60, 2.5, -2, 3.14}, {1, 60, 2.5, -2, 3.14}}}; -using LimiterConfigTestParams = - std::tuple, Descriptor>, int32_t, bool, int32_t, bool, - LimiterConfigTestAdditional>; +using LimiterConfigTestParams = std::tuple, Descriptor>, + int32_t, bool, int32_t, LimiterConfigTestAdditional>; void fillLimiterConfig(DynamicsProcessing::LimiterConfig& cfg, const LimiterConfigTestParams& params) { @@ -609,8 +606,7 @@ class DynamicsProcessingTestLimiterConfig public DynamicsProcessingTestHelper { public: DynamicsProcessingTestLimiterConfig() - : DynamicsProcessingTestHelper(std::get(GetParam())), - mLimiterInUseEngine(std::get(GetParam())) { + : DynamicsProcessingTestHelper(std::get(GetParam())) { fillLimiterConfig(mCfg, GetParam()); } @@ -619,11 +615,9 @@ class DynamicsProcessingTestLimiterConfig void TearDown() override { TearDownDynamicsProcessingEffect(); } DynamicsProcessing::LimiterConfig mCfg; - bool mLimiterInUseEngine; }; TEST_P(DynamicsProcessingTestLimiterConfig, SetAndGetLimiterConfig) { - mEngineConfigPreset.limiterInUse = mLimiterInUseEngine; EXPECT_NO_FATAL_FAILURE(addEngineConfig(mEngineConfigPreset)); EXPECT_NO_FATAL_FAILURE(addLimiterConfig({mCfg})); SetAndGetDynamicsProcessingParameters(); @@ -633,21 +627,18 @@ INSTANTIATE_TEST_SUITE_P( DynamicsProcessingTest, DynamicsProcessingTestLimiterConfig, ::testing::Combine(testing::ValuesIn(EffectFactoryHelper::getAllEffectDescriptors( IFactory::descriptor, getEffectTypeUuidDynamicsProcessing())), - testing::Values(-1, 0, 1, 2), // channel count - testing::Bool(), // enable - testing::Values(3), // link group - testing::Bool(), // engine limiter enable + testing::Values(-1, 0, 1, 2), // channel count + testing::Bool(), // enable + testing::Values(3), // link group testing::ValuesIn(kLimiterConfigTestAdditionalParam)), // Additional [](const auto& info) { auto descriptor = std::get(info.param).second; DynamicsProcessing::LimiterConfig cfg; fillLimiterConfig(cfg, info.param); - std::string engineLimiterInUse = - std::to_string(std::get(info.param)); std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + descriptor.common.name + "_UUID_" + toString(descriptor.common.id.uuid) + "_limiterConfig_" + - cfg.toString() + "_engineSetting_" + engineLimiterInUse; + cfg.toString(); std::replace_if( name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); return name; @@ -659,11 +650,10 @@ GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DynamicsProcessingTestLimiterConfi */ enum ChannelConfigTestParamName { BAND_CHANNEL_TEST_INSTANCE_NAME, - BAND_CHANNEL_TEST_CHANNEL_CONFIG, - BAND_CHANNEL_TEST_ENGINE_IN_USE + BAND_CHANNEL_TEST_CHANNEL_CONFIG }; using ChannelConfigTestParams = std::tuple, Descriptor>, - std::vector, bool>; + std::vector>; class DynamicsProcessingTestChannelConfig : public ::testing::TestWithParam, @@ -671,33 +661,28 @@ class DynamicsProcessingTestChannelConfig public: DynamicsProcessingTestChannelConfig() : DynamicsProcessingTestHelper(std::get(GetParam())), - mCfg(std::get(GetParam())), - mInUseEngine(std::get(GetParam())) {} + mCfg(std::get(GetParam())) {} void SetUp() override { SetUpDynamicsProcessingEffect(); } void TearDown() override { TearDownDynamicsProcessingEffect(); } std::vector mCfg; - const bool mInUseEngine; }; TEST_P(DynamicsProcessingTestChannelConfig, SetAndGetPreEqChannelConfig) { - mEngineConfigPreset.preEqStage.inUse = mInUseEngine; EXPECT_NO_FATAL_FAILURE(addEngineConfig(mEngineConfigPreset)); EXPECT_NO_FATAL_FAILURE(addPreEqChannelConfig(mCfg)); SetAndGetDynamicsProcessingParameters(); } TEST_P(DynamicsProcessingTestChannelConfig, SetAndGetPostEqChannelConfig) { - mEngineConfigPreset.postEqStage.inUse = mInUseEngine; EXPECT_NO_FATAL_FAILURE(addEngineConfig(mEngineConfigPreset)); EXPECT_NO_FATAL_FAILURE(addPostEqChannelConfig(mCfg)); SetAndGetDynamicsProcessingParameters(); } TEST_P(DynamicsProcessingTestChannelConfig, SetAndGetMbcChannelConfig) { - mEngineConfigPreset.mbcStage.inUse = mInUseEngine; EXPECT_NO_FATAL_FAILURE(addEngineConfig(mEngineConfigPreset)); EXPECT_NO_FATAL_FAILURE(addMbcChannelConfig(mCfg)); SetAndGetDynamicsProcessingParameters(); @@ -709,19 +694,15 @@ INSTANTIATE_TEST_SUITE_P( testing::ValuesIn(EffectFactoryHelper::getAllEffectDescriptors( IFactory::descriptor, getEffectTypeUuidDynamicsProcessing())), testing::ValuesIn( - DynamicsProcessingTestHelper::kChannelConfigTestSet), // channel config - testing::Bool()), // Engine inUse + DynamicsProcessingTestHelper::kChannelConfigTestSet)), // channel config [](const auto& info) { auto descriptor = std::get(info.param).second; - std::string engineInUse = - std::to_string(std::get(info.param)); std::string channelConfig = ::android::internal::ToString( std::get(info.param)); std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + descriptor.common.name + "_UUID_" + - toString(descriptor.common.id.uuid) + "_" + channelConfig + - "_engineInUse_" + engineInUse; + toString(descriptor.common.id.uuid) + "_" + channelConfig; std::replace_if( name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); return name; @@ -736,11 +717,10 @@ enum EqBandConfigTestParamName { EQ_BAND_CHANNEL, EQ_BAND_ENABLE, EQ_BAND_CUT_OFF_FREQ, - EQ_BAND_GAIN, - EQ_BAND_STAGE_IN_USE + EQ_BAND_GAIN }; using EqBandConfigTestParams = std::tuple, Descriptor>, int32_t, - bool, std::vector>, float, bool>; + bool, std::vector>, float>; void fillEqBandConfig(std::vector& cfgs, const EqBandConfigTestParams& params) { @@ -760,8 +740,7 @@ class DynamicsProcessingTestEqBandConfig : public ::testing::TestWithParam(GetParam())), - mStageInUse(std::get(GetParam())) { + : DynamicsProcessingTestHelper(std::get(GetParam())) { fillEqBandConfig(mCfgs, GetParam()); } @@ -770,11 +749,9 @@ class DynamicsProcessingTestEqBandConfig : public ::testing::TestWithParam mCfgs; - const bool mStageInUse; }; TEST_P(DynamicsProcessingTestEqBandConfig, SetAndGetPreEqBandConfig) { - mEngineConfigPreset.preEqStage.inUse = mStageInUse; mEngineConfigPreset.preEqStage.bandCount = mCfgs.size(); EXPECT_NO_FATAL_FAILURE(addEngineConfig(mEngineConfigPreset)); std::vector cfgs(mChannelCount); @@ -788,7 +765,6 @@ TEST_P(DynamicsProcessingTestEqBandConfig, SetAndGetPreEqBandConfig) { } TEST_P(DynamicsProcessingTestEqBandConfig, SetAndGetPostEqBandConfig) { - mEngineConfigPreset.postEqStage.inUse = mStageInUse; mEngineConfigPreset.postEqStage.bandCount = mCfgs.size(); EXPECT_NO_FATAL_FAILURE(addEngineConfig(mEngineConfigPreset)); std::vector cfgs(mChannelCount); @@ -849,21 +825,19 @@ INSTANTIATE_TEST_SUITE_P( DynamicsProcessingTest, DynamicsProcessingTestEqBandConfig, ::testing::Combine(testing::ValuesIn(EffectFactoryHelper::getAllEffectDescriptors( IFactory::descriptor, getEffectTypeUuidDynamicsProcessing())), - testing::Values(-1, 0, 10), // channel ID - testing::Bool(), // band enable - testing::ValuesIn(kBands), // cut off frequencies - testing::Values(-3.14f, 3.14f), // gain - testing::Values(true)), // stage in use + testing::Values(-1, 0, 10), // channel ID + testing::Bool(), // band enable + testing::ValuesIn(kBands), // cut off frequencies + testing::Values(-3.14f, 3.14f) // gain + ), [](const auto& info) { auto descriptor = std::get(info.param).second; std::vector cfgs; fillEqBandConfig(cfgs, info.param); std::string bands = ::android::internal::ToString(cfgs); - std::string stageInUse = std::to_string(std::get(info.param)); std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + descriptor.common.name + "_UUID_" + - toString(descriptor.common.id.uuid) + "_bands_" + bands + - "_stageInUse_" + stageInUse; + toString(descriptor.common.id.uuid) + "_bands_" + bands; std::replace_if( name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); return name; @@ -879,7 +853,6 @@ enum MbcBandConfigParamName { MBC_BAND_CHANNEL, MBC_BAND_ENABLE, MBC_BAND_CUTOFF_FREQ, - MBC_BAND_STAGE_IN_USE, MBC_BAND_ADDITIONAL }; enum MbcBandConfigAdditional { @@ -905,7 +878,7 @@ static constexpr std::array kMbcBandConfig using TestParamsMbcBandConfig = std::tuple, Descriptor>, int32_t, bool, - std::vector>, bool, TestParamsMbcBandConfigAdditional>; + std::vector>, TestParamsMbcBandConfigAdditional>; void fillMbcBandConfig(std::vector& cfgs, const TestParamsMbcBandConfig& params) { @@ -936,8 +909,7 @@ class DynamicsProcessingTestMbcBandConfig public DynamicsProcessingTestHelper { public: DynamicsProcessingTestMbcBandConfig() - : DynamicsProcessingTestHelper(std::get(GetParam())), - mStageInUse(std::get(GetParam())) { + : DynamicsProcessingTestHelper(std::get(GetParam())) { fillMbcBandConfig(mCfgs, GetParam()); } @@ -946,11 +918,9 @@ class DynamicsProcessingTestMbcBandConfig void TearDown() override { TearDownDynamicsProcessingEffect(); } std::vector mCfgs; - const bool mStageInUse; }; TEST_P(DynamicsProcessingTestMbcBandConfig, SetAndGetMbcBandConfig) { - mEngineConfigPreset.mbcStage.inUse = mStageInUse; mEngineConfigPreset.mbcStage.bandCount = mCfgs.size(); EXPECT_NO_FATAL_FAILURE(addEngineConfig(mEngineConfigPreset)); std::vector cfgs(mChannelCount); @@ -970,18 +940,15 @@ INSTANTIATE_TEST_SUITE_P( testing::Values(-1, 0, 10), // channel count testing::Bool(), // enable testing::ValuesIn(kBands), // cut off frequencies - testing::Bool(), // stage in use testing::ValuesIn(kMbcBandConfigAdditionalParam)), // Additional [](const auto& info) { auto descriptor = std::get(info.param).second; std::vector cfgs; fillMbcBandConfig(cfgs, info.param); std::string mbcBands = ::android::internal::ToString(cfgs); - std::string stageInUse = std::to_string(std::get(info.param)); std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + descriptor.common.name + "_UUID_" + - toString(descriptor.common.id.uuid) + "_bands_" + mbcBands + - "_stageInUse_" + stageInUse; + toString(descriptor.common.id.uuid) + "_bands_" + mbcBands; std::replace_if( name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); return name;