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

Commit 1c54793b authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Effect AIDL VTS: skip state check after STOP if draining is not supported am:... 

Effect AIDL VTS: skip state check after STOP if draining is not supported am: eeda2b2e am: be69ce1d

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



Change-Id: I94cdf9d19a3c22285a2aa1204551e8684ae9f982
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8eb60ff7 be69ce1d

audio/aidl/vts/EffectHelper.h

+11 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ using aidl::android::hardware::audio::effect::getEffectTypeUuidSpatializer; 
using aidl::android::hardware::audio::effect::getRange;

using aidl::android::hardware::audio::effect::IEffect;

using aidl::android::hardware::audio::effect::isRangeValid;

using aidl::android::hardware::audio::effect::kDrainSupportedVersion;

using aidl::android::hardware::audio::effect::kEffectTypeUuidSpatializer;

using aidl::android::hardware::audio::effect::kEventFlagDataMqNotEmpty;

using aidl::android::hardware::audio::effect::kEventFlagDataMqUpdate;
@@ -195,8 +196,11 @@ class EffectHelper { 
                ASSERT_TRUE(expectState(effect, State::PROCESSING));

                break;

            case CommandId::STOP:

                // Enforce the state checking after kDrainSupportedVersion

                if (getHalVersion(effect) >= kDrainSupportedVersion) {

                    ASSERT_TRUE(expectState(effect, State::IDLE) ||

                                expectState(effect, State::DRAINING));

                }

                break;

            case CommandId::RESET:

                ASSERT_TRUE(expectState(effect, State::IDLE));
@@ -518,6 +522,11 @@ class EffectHelper { 
        }

    }



    static int getHalVersion(const std::shared_ptr<IEffect>& effect) {

        int version = 0;

        return (effect && effect->getInterfaceVersion(&version).isOk()) ? version : 0;

    }



    bool mIsSpatializer;

    Descriptor mDescriptor;

    size_t mInputFrameSize, mOutputFrameSize;