From 876879db95cff31baf4cfbf630bdbafd05931eb3 Mon Sep 17 00:00:00 2001 From: David Li Date: Tue, 14 Nov 2023 23:31:53 +0800 Subject: [PATCH] Effect AIDL: skip volume checking Bug: 310751043 Test: atest VtsHalAudioEffectTargetTest Change-Id: I1b8b32ba7cd33ac3c00637ca86e041f1f58c69f3 --- .../acousticEchoCanceler/AcousticEchoCancelerSw.cpp | 2 +- .../default/noiseSuppression/NoiseSuppressionSw.cpp | 2 +- audio/aidl/default/visualizer/VisualizerSw.cpp | 2 +- audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp | 10 ++++++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/audio/aidl/default/acousticEchoCanceler/AcousticEchoCancelerSw.cpp b/audio/aidl/default/acousticEchoCanceler/AcousticEchoCancelerSw.cpp index 87272320db..5e18f1b12f 100644 --- a/audio/aidl/default/acousticEchoCanceler/AcousticEchoCancelerSw.cpp +++ b/audio/aidl/default/acousticEchoCanceler/AcousticEchoCancelerSw.cpp @@ -76,7 +76,7 @@ const Descriptor AcousticEchoCancelerSw::kDescriptor = { .proxy = std::nullopt}, .flags = {.type = Flags::Type::PRE_PROC, .insert = Flags::Insert::FIRST, - .volume = Flags::Volume::CTRL}, + .volume = Flags::Volume::NONE}, .name = AcousticEchoCancelerSw::kEffectName, .implementor = "The Android Open Source Project"}, .capability = AcousticEchoCancelerSw::kCapability}; diff --git a/audio/aidl/default/noiseSuppression/NoiseSuppressionSw.cpp b/audio/aidl/default/noiseSuppression/NoiseSuppressionSw.cpp index 99f2cafad7..a3208df865 100644 --- a/audio/aidl/default/noiseSuppression/NoiseSuppressionSw.cpp +++ b/audio/aidl/default/noiseSuppression/NoiseSuppressionSw.cpp @@ -67,7 +67,7 @@ const Descriptor NoiseSuppressionSw::kDescriptor = { .proxy = std::nullopt}, .flags = {.type = Flags::Type::PRE_PROC, .insert = Flags::Insert::FIRST, - .volume = Flags::Volume::CTRL}, + .volume = Flags::Volume::NONE}, .name = NoiseSuppressionSw::kEffectName, .implementor = "The Android Open Source Project"}}; diff --git a/audio/aidl/default/visualizer/VisualizerSw.cpp b/audio/aidl/default/visualizer/VisualizerSw.cpp index 0909f25144..285c102b6b 100644 --- a/audio/aidl/default/visualizer/VisualizerSw.cpp +++ b/audio/aidl/default/visualizer/VisualizerSw.cpp @@ -73,7 +73,7 @@ const Descriptor VisualizerSw::kDescriptor = { .proxy = std::nullopt}, .flags = {.type = Flags::Type::INSERT, .insert = Flags::Insert::FIRST, - .volume = Flags::Volume::CTRL}, + .volume = Flags::Volume::NONE}, .name = VisualizerSw::kEffectName, .implementor = "The Android Open Source Project"}, .capability = VisualizerSw::kCapability}; diff --git a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp index ca1cea9aff..aaf9ad4e74 100644 --- a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp @@ -596,8 +596,14 @@ TEST_P(AudioEffectTest, SetAndGetParameterVolume) { Parameter::Id id = Parameter::Id::make(Parameter::volumeStereo); Parameter::VolumeStereo volume = {.left = 10.0, .right = 10.0}; - ASSERT_NO_FATAL_FAILURE( - setAndGetParameter(id, Parameter::make(volume))); + if (mDescriptor.common.flags.volume == Flags::Volume::CTRL) { + Parameter get; + EXPECT_IS_OK(mEffect->setParameter(volume)); + EXPECT_IS_OK(mEffect->getParameter(id, &get)); + } else { + ASSERT_NO_FATAL_FAILURE( + setAndGetParameter(id, Parameter::make(volume))); + } ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::STOP)); ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::IDLE));