| commit | 1cfcadb82d3a6b8f528f1702ec664107a407ebed | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Dec 28 21:17:56 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 28 21:17:56 2022 +0000 |
| tree | 74a1e654227f5a3b7f976c234a85e2c1b2ee21ce | |
| parent | 4471fb5cb81c44ef9289497f75e4ff83656b0adf [diff] | |
| parent | 53b0aa6efef187486cdb3f2b6eab384f4f2bf844 [diff] |
Merge "Virtualizer : Add minimum and maximum capabilities for params." am: 53b0aa6efe Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2369333 Change-Id: I0a05bc2587018014e93ebe55c90204b54f1acf77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libeffects/lvm/wrapper/Aidl/BundleContext.cpp b/media/libeffects/lvm/wrapper/Aidl/BundleContext.cpp index 2b69289..3aee721 100644 --- a/media/libeffects/lvm/wrapper/Aidl/BundleContext.cpp +++ b/media/libeffects/lvm/wrapper/Aidl/BundleContext.cpp
@@ -551,8 +551,7 @@ } RetCode BundleContext::setVirtualizerStrength(int strength) { - if (strength < Virtualizer::MIN_PER_MILLE_STRENGTH || - strength > Virtualizer::MAX_PER_MILLE_STRENGTH) { + if (strength < 0 || strength > lvm::kVirtualizerCap.maxStrengthPm) { return RetCode::ERROR_ILLEGAL_PARAMETER; }
diff --git a/media/libeffects/lvm/wrapper/Aidl/BundleTypes.h b/media/libeffects/lvm/wrapper/Aidl/BundleTypes.h index 893943e..1996240 100644 --- a/media/libeffects/lvm/wrapper/Aidl/BundleTypes.h +++ b/media/libeffects/lvm/wrapper/Aidl/BundleTypes.h
@@ -104,7 +104,8 @@ .implementor = "NXP Software Ltd."}, .capability = Capability::make<Capability::bassBoost>(kBassBoostCap)}; -static const Virtualizer::Capability kVirtualizerCap = {.strengthSupported = mStrengthSupported}; +static const Virtualizer::Capability kVirtualizerCap = {.maxStrengthPm = 1000, + .strengthSupported = mStrengthSupported}; static const std::string kVirtualizerEffectName = "Virtualizer";