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

Commit 4b133e63 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Effect Aidl: skipping reopen test for unsupported audio hal" into main

parents bc0ff1c2 9f9fe929

audio/aidl/vts/EffectFactoryHelper.h

+11 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <aidl/Vintf.h>

#include <android/binder_auto_utils.h>

#include <system/audio_effects/aidl_effects_utils.h>



#include "AudioHalBinderServiceUtil.h"

#include "TestUtils.h"
@@ -74,6 +75,16 @@ class EffectFactoryHelper { 
        return result;

    }



    static int getHalVersion(const std::shared_ptr<IFactory>& factory) {

        int version = 0;

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

    }



    static bool isReopenSupported(const std::shared_ptr<IFactory>& factory) {

        return EffectFactoryHelper::getHalVersion(factory) >=

               aidl::android::hardware::audio::effect::kReopenSupportedVersion;

    }



  private:

    std::shared_ptr<IFactory> mEffectFactory;

    std::string mServiceName;

audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp

+9 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ using aidl::android::hardware::audio::effect::Descriptor; 
using aidl::android::hardware::audio::effect::Flags;

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

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

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

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

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

using aidl::android::media::audio::common::AudioDeviceDescription;
@@ -613,6 +614,10 @@ TEST_P(AudioEffectTest, SetAndGetParameterVolume) { 
 * verify reopen sequence.

 */

TEST_P(AudioEffectDataPathTest, SetCommonParameterAndReopen) {

    if (!EffectFactoryHelper::isReopenSupported(mFactory)) {

        GTEST_SKIP() << "Skipping test as effect does not support reopen";

    }



    ASSERT_NO_FATAL_FAILURE(create(mFactory, mEffect, mDescriptor));



    Parameter::Common common = EffectHelper::createParamCommon(
@@ -732,6 +737,10 @@ TEST_P(AudioEffectDataPathTest, ConsumeDataAfterRestart) { 
// Send data to effects and expect it to be consumed after effect reopen (IO AudioConfig change).

// Effects exposing bypass flags or operating in offload mode will be skipped.

TEST_P(AudioEffectDataPathTest, ConsumeDataAfterReopen) {

    if (!EffectFactoryHelper::isReopenSupported(mFactory)) {

        GTEST_SKIP() << "Skipping test as effect does not support reopen";

    }



    ASSERT_NO_FATAL_FAILURE(create(mFactory, mEffect, mDescriptor));



    Parameter::Common common = EffectHelper::createParamCommon(