Refactor VTS tests to use common sine input generation method
Bug: 305866207
Test: atest VtsHalVolumeTargetTest
atest VtsHalPresetReverbTargetTest
atest VtsHalVirtualizerTargetTest
atest VtsHalBassBoostTargetTest
atest VtsHalEnvironmentalReverbTargetTest
Change-Id: I6b31ba94ffed15b4ac467eec87e45c4c5f5b3805
diff --git a/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp b/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp
index 1e4e735..a29920e 100644
--- a/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp
+++ b/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp
@@ -224,12 +224,6 @@
output.size());
}
- void generateSineWaveInput(std::vector<float>& input) {
- int frequency = 1000;
- for (size_t i = 0; i < input.size(); i++) {
- input[i] = sin(2 * M_PI * frequency * i / kSamplingFrequency);
- }
- }
using Maker = EnvironmentalReverb (*)(int);
static constexpr std::array<Maker, static_cast<int>(EnvironmentalReverb::bypass) + 1>
@@ -287,6 +281,7 @@
static constexpr int kDurationMilliSec = 500;
static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;
+ static constexpr int kInputFrequency = 1000;
int mStereoChannelCount =
getChannelCount(AudioChannelLayout::make<AudioChannelLayout::layoutMask>(
@@ -349,7 +344,7 @@
: EnvironmentalReverbHelper(std::get<DESCRIPTOR_INDEX>(GetParam())) {
std::tie(mTag, mParamValues) = std::get<TAG_VALUE_PAIR>(GetParam());
mInput.resize(kBufferSize);
- generateSineWaveInput(mInput);
+ generateSineWave(kInputFrequency, mInput);
}
void SetUp() override {
SKIP_TEST_IF_DATA_UNSUPPORTED(mDescriptor.common.flags);
@@ -439,7 +434,7 @@
TEST_P(EnvironmentalReverbMinimumParamTest, MinimumValueTest) {
std::vector<float> input(kBufferSize);
- generateSineWaveInput(input);
+ generateSineWave(kInputFrequency, input);
std::vector<float> output(kBufferSize);
setParameterAndProcess(input, output, mValue, mTag);
float energy = computeOutputEnergy(input, output);
@@ -475,7 +470,7 @@
: EnvironmentalReverbHelper(std::get<DESCRIPTOR_INDEX>(GetParam())) {
std::tie(mTag, mParamValues) = std::get<TAG_VALUE_PAIR>(GetParam());
mInput.resize(kBufferSize);
- generateSineWaveInput(mInput);
+ generateSineWave(kInputFrequency, mInput);
}
void SetUp() override {
SKIP_TEST_IF_DATA_UNSUPPORTED(mDescriptor.common.flags);
@@ -554,7 +549,7 @@
if (mIsInputMute) {
std::fill(mInput.begin(), mInput.end(), 0);
} else {
- generateSineWaveInput(mInput);
+ generateSineWave(kInputFrequency, mInput);
}
}
void SetUp() override {