diff options
| author | Shunkai Yao <yaoshunkai@google.com> | 2024-04-22 23:52:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-22 23:52:06 +0000 |
| commit | f7391d5ac473dad68f4fcce72128142d2dbc939e (patch) | |
| tree | 347b4075c00a02b956f463ca80b7978856eeca01 | |
| parent | 30da02f70496a6369c465708c00cf6c4fbcd8bd5 (diff) | |
| parent | 972b465a0eee47ac40834db8384175a28c3ca614 (diff) | |
| download | interfaces-f7391d5ac473dad68f4fcce72128142d2dbc939e.tar.gz | |
Merge "Effect AIDL VTS: relax dynamics processing effect parameter validations" into main
| -rw-r--r-- | audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp b/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp index 69ab91b0bc..3ed9ed20f2 100644 --- a/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp +++ b/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp @@ -195,48 +195,42 @@ const std::set<std::vector<DynamicsProcessing::InputGain>> template <typename T> bool DynamicsProcessingTestHelper::isBandConfigValid(const std::vector<T>& cfgs, int bandCount) { - std::vector<float> freqs(cfgs.size(), -1); + std::unordered_set<int> freqs; for (auto cfg : cfgs) { if (cfg.channel < 0 || cfg.channel >= mChannelCount) return false; if (cfg.band < 0 || cfg.band >= bandCount) return false; - freqs[cfg.band] = cfg.cutoffFrequencyHz; + // duplicated band index + if (freqs.find(cfg.band) != freqs.end()) return false; + freqs.insert(cfg.band); } - if (std::count(freqs.begin(), freqs.end(), -1)) return false; - return std::is_sorted(freqs.begin(), freqs.end()); + return true; } bool DynamicsProcessingTestHelper::isParamValid(const DynamicsProcessing::Tag& tag, const DynamicsProcessing& dp) { switch (tag) { case DynamicsProcessing::preEq: { - if (!mEngineConfigApplied.preEqStage.inUse) return false; return isChannelConfigValid(dp.get<DynamicsProcessing::preEq>()); } case DynamicsProcessing::postEq: { - if (!mEngineConfigApplied.postEqStage.inUse) return false; return isChannelConfigValid(dp.get<DynamicsProcessing::postEq>()); } case DynamicsProcessing::mbc: { - if (!mEngineConfigApplied.mbcStage.inUse) return false; return isChannelConfigValid(dp.get<DynamicsProcessing::mbc>()); } case DynamicsProcessing::preEqBand: { - if (!mEngineConfigApplied.preEqStage.inUse) return false; return isBandConfigValid(dp.get<DynamicsProcessing::preEqBand>(), mEngineConfigApplied.preEqStage.bandCount); } case DynamicsProcessing::postEqBand: { - if (!mEngineConfigApplied.postEqStage.inUse) return false; return isBandConfigValid(dp.get<DynamicsProcessing::postEqBand>(), mEngineConfigApplied.postEqStage.bandCount); } case DynamicsProcessing::mbcBand: { - if (!mEngineConfigApplied.mbcStage.inUse) return false; return isBandConfigValid(dp.get<DynamicsProcessing::mbcBand>(), mEngineConfigApplied.mbcStage.bandCount); } case DynamicsProcessing::limiter: { - if (!mEngineConfigApplied.limiterInUse) return false; return isChannelConfigValid(dp.get<DynamicsProcessing::limiter>()); } case DynamicsProcessing::inputGain: { |