Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cedc603 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Effect AIDL: skip volume checking" into main am: a1d092a8 am: 46398af1 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2848053



Change-Id: Ia57db978eea065c3dead3c2da089fd355bb22a9a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b0a4cce 46398af1

audio/aidl/default/acousticEchoCanceler/AcousticEchoCancelerSw.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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};

audio/aidl/default/noiseSuppression/NoiseSuppressionSw.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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"}};

audio/aidl/default/visualizer/VisualizerSw.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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};

audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp

+8 −2
Original line number Diff line number Diff line
@@ -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};

    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));