diff --git a/audio/aidl/vts/VtsHalAECTargetTest.cpp b/audio/aidl/vts/VtsHalAECTargetTest.cpp index 1a7c3d4446..0354e3ce23 100644 --- a/audio/aidl/vts/VtsHalAECTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAECTargetTest.cpp @@ -51,7 +51,7 @@ class AECParamTest : public ::testing::TestWithParam, public ASSERT_NE(nullptr, mFactory); ASSERT_NO_FATAL_FAILURE(create(mFactory, mEffect, mDescriptor)); - Parameter::Specific specific = getDefaultParamSpecific(); + auto specific = getDefaultParamSpecific(); Parameter::Common common = EffectHelper::createParamCommon( 0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */, kInputFrameCount /* iFrameCount */, kOutputFrameCount /* oFrameCount */); @@ -65,8 +65,13 @@ class AECParamTest : public ::testing::TestWithParam, public ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect)); } - Parameter::Specific getDefaultParamSpecific() { - AcousticEchoCanceler aec = AcousticEchoCanceler::make(0); + std::optional getDefaultParamSpecific() { + auto aec = AcousticEchoCanceler::make(0); + if (!isParameterValid(aec, + mDescriptor)) { + return std::nullopt; + } + Parameter::Specific specific = Parameter::Specific::make(aec); return specific; diff --git a/audio/aidl/vts/VtsHalNSTargetTest.cpp b/audio/aidl/vts/VtsHalNSTargetTest.cpp index bbb11fc278..624d5d2991 100644 --- a/audio/aidl/vts/VtsHalNSTargetTest.cpp +++ b/audio/aidl/vts/VtsHalNSTargetTest.cpp @@ -48,7 +48,7 @@ class NSParamTest : public ::testing::TestWithParam, public Ef ASSERT_NE(nullptr, mFactory); ASSERT_NO_FATAL_FAILURE(create(mFactory, mEffect, mDescriptor)); - Parameter::Specific specific = getDefaultParamSpecific(); + std::optional specific = getDefaultParamSpecific(); Parameter::Common common = EffectHelper::createParamCommon( 0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */, kInputFrameCount /* iFrameCount */, kOutputFrameCount /* oFrameCount */); @@ -62,9 +62,13 @@ class NSParamTest : public ::testing::TestWithParam, public Ef ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect)); } - Parameter::Specific getDefaultParamSpecific() { + std::optional getDefaultParamSpecific() { NoiseSuppression ns = NoiseSuppression::make(NoiseSuppression::Level::MEDIUM); + if (!isParameterValid(ns, mDescriptor)) { + return std::nullopt; + } + Parameter::Specific specific = Parameter::Specific::make(ns); return specific; @@ -85,7 +89,9 @@ class NSParamTest : public ::testing::TestWithParam, public Ef // validate parameter Descriptor desc; ASSERT_STATUS(EX_NONE, mEffect->getDescriptor(&desc)); - const binder_exception_t expected = EX_NONE; + const bool valid = + isParameterValid(ns, desc); + const binder_exception_t expected = valid ? EX_NONE : EX_ILLEGAL_ARGUMENT; // set parameter Parameter expectParam;