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

Commit 942498c7 authored by David Li's avatar David Li Committed by Android (Google) Code Review
Browse files

Merge "Effect AIDL: skip volume checking" into main

parents dbb69167 876879db

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