mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 22:04:26 +00:00
Merge "Effect AIDL: skip volume checking" into main am: a1d092a818
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2848053 Change-Id: I3211d82b5ef07eb905557c604ba6ea1f83ab2456 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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};
|
||||
|
||||
@@ -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"}};
|
||||
|
||||
|
||||
@@ -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};
|
||||
|
||||
@@ -596,8 +596,14 @@ TEST_P(AudioEffectTest, SetAndGetParameterVolume) {
|
||||
|
||||
Parameter::Id id = Parameter::Id::make<Parameter::Id::commonTag>(Parameter::volumeStereo);
|
||||
Parameter::VolumeStereo volume = {.left = 10.0, .right = 10.0};
|
||||
ASSERT_NO_FATAL_FAILURE(
|
||||
setAndGetParameter(id, Parameter::make<Parameter::volumeStereo>(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<Parameter::volumeStereo>(volume)));
|
||||
}
|
||||
|
||||
ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::STOP));
|
||||
ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::IDLE));
|
||||
|
||||
Reference in New Issue
Block a user