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

Commit 5df4e6c4 authored by Shunkai Yao's avatar Shunkai Yao
Browse files

AIDL effect: update AudioDeviceDescription to list 

Bug: 261129656
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I424afb287fa97a6bf39221ba64d6af50c1d697eb
parent 0edf57e0

audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Parameter.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ package android.hardware.audio.effect; 
@VintfStability

@VintfStability

union Parameter {

union Parameter {

  android.hardware.audio.effect.Parameter.Common common;

  android.hardware.audio.effect.Parameter.Common common;

  android.media.audio.common.AudioDeviceDescription deviceDescription;

  android.media.audio.common.AudioDeviceDescription[] deviceDescription;

  android.media.audio.common.AudioMode mode;

  android.media.audio.common.AudioMode mode;

  android.media.audio.common.AudioSource source;

  android.media.audio.common.AudioSource source;

  android.hardware.audio.effect.Parameter.VolumeStereo volumeStereo;

  android.hardware.audio.effect.Parameter.VolumeStereo volumeStereo;

audio/aidl/android/hardware/audio/effect/Parameter.aidl

+4 −3
Original line number Original line Diff line number Diff line
@@ -120,10 +120,11 @@ union Parameter { 
    Common common;

    Common common;





    /**

    /**

     * Used by audio framework to set the device type to effect engine.

     * Used by audio framework to set the device type(s) to effect engine.

     * Effect must implement setParameter(device) if Flags.deviceIndication set to true.

     * Effect engine must apply all AudioDeviceDescription in the list.

     * Effect must implement setParameter(deviceDescription) if Flags.deviceIndication set to true.

     */

     */

    AudioDeviceDescription deviceDescription;

    AudioDeviceDescription[] deviceDescription;

    /**

    /**

     * Used by audio framework to set the audio mode to effect engine.

     * Used by audio framework to set the audio mode to effect engine.

     * Effect must implement setParameter(mode) if Flags.audioModeIndication set to true.

     * Effect must implement setParameter(mode) if Flags.audioModeIndication set to true.

audio/aidl/default/include/effect-impl/EffectContext.h

+5 −3
Original line number Original line Diff line number Diff line
@@ -91,11 +91,13 @@ class EffectContext { 
    int getSessionId() { return mSessionId; }

    int getSessionId() { return mSessionId; }





    virtual RetCode setOutputDevice(

    virtual RetCode setOutputDevice(

            const aidl::android::media::audio::common::AudioDeviceDescription& device) {

            const std::vector<aidl::android::media::audio::common::AudioDeviceDescription>&

                    device) {

        mOutputDevice = device;

        mOutputDevice = device;

        return RetCode::SUCCESS;

        return RetCode::SUCCESS;

    }

    }

    virtual aidl::android::media::audio::common::AudioDeviceDescription getOutputDevice() {

    virtual std::vector<aidl::android::media::audio::common::AudioDeviceDescription>

    getOutputDevice() {

        return mOutputDevice;

        return mOutputDevice;

    }

    }
@@ -133,7 +135,7 @@ class EffectContext { 
    size_t mInputFrameSize;

    size_t mInputFrameSize;

    size_t mOutputFrameSize;

    size_t mOutputFrameSize;

    Parameter::Common mCommon;

    Parameter::Common mCommon;

    aidl::android::media::audio::common::AudioDeviceDescription mOutputDevice;

    std::vector<aidl::android::media::audio::common::AudioDeviceDescription> mOutputDevice;

    aidl::android::media::audio::common::AudioMode mMode;

    aidl::android::media::audio::common::AudioMode mMode;

    aidl::android::media::audio::common::AudioSource mSource;

    aidl::android::media::audio::common::AudioSource mSource;

    Parameter::VolumeStereo mVolumeStereo;

    Parameter::VolumeStereo mVolumeStereo;

audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp

+107 −40
Original line number Original line Diff line number Diff line
@@ -47,6 +47,10 @@ using aidl::android::hardware::audio::effect::IEffect; 
using aidl::android::hardware::audio::effect::IFactory;

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

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

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

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

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

using aidl::android::media::audio::common::AudioDeviceDescription;

using aidl::android::media::audio::common::AudioDeviceType;

using aidl::android::media::audio::common::AudioMode;

using aidl::android::media::audio::common::AudioSource;





enum ParamName { PARAM_INSTANCE_NAME };

enum ParamName { PARAM_INSTANCE_NAME };

using EffectTestParam = std::tuple<std::pair<std::shared_ptr<IFactory>, Descriptor>>;

using EffectTestParam = std::tuple<std::pair<std::shared_ptr<IFactory>, Descriptor>>;
@@ -73,6 +77,13 @@ class AudioEffectTest : public testing::TestWithParam<EffectTestParam>, public E 
    std::shared_ptr<IFactory> mFactory;

    std::shared_ptr<IFactory> mFactory;

    std::shared_ptr<IEffect> mEffect;

    std::shared_ptr<IEffect> mEffect;

    Descriptor mDescriptor;

    Descriptor mDescriptor;



    void setAndGetParameter(Parameter::Id id, const Parameter& set) {

        Parameter get;

        EXPECT_IS_OK(mEffect->setParameter(set));

        EXPECT_IS_OK(mEffect->getParameter(id, &get));

        EXPECT_EQ(set, get) << set.toString() << " vs " << get.toString();

    }

};

};





TEST_P(AudioEffectTest, SetupAndTearDown) {

TEST_P(AudioEffectTest, SetupAndTearDown) {
@@ -392,14 +403,8 @@ TEST_P(AudioEffectTest, SetAndGetCommonParameter) { 




    Parameter::Common common = EffectHelper::createParamCommon(

    Parameter::Common common = EffectHelper::createParamCommon(

            0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */);

            0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */);

    Parameter get = Parameter(), set = Parameter();

    Parameter::Id id = Parameter::Id::make<Parameter::Id::commonTag>(Parameter::common);

    set.set<Parameter::common>(common);

    ASSERT_NO_FATAL_FAILURE(setAndGetParameter(id, Parameter::make<Parameter::common>(common)));

    EXPECT_IS_OK(mEffect->setParameter(set));



    Parameter::Id id;

    id.set<Parameter::Id::commonTag>(Parameter::common);

    EXPECT_IS_OK(mEffect->getParameter(id, &get));

    EXPECT_EQ(set, get) << set.toString() << " vs " << get.toString();





    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));
@@ -414,14 +419,8 @@ TEST_P(AudioEffectTest, SetAndGetParameterInProcessing) { 




    Parameter::Common common = EffectHelper::createParamCommon(

    Parameter::Common common = EffectHelper::createParamCommon(

            0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */);

            0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */);

    Parameter get = Parameter(), set = Parameter();

    Parameter::Id id = Parameter::Id::make<Parameter::Id::commonTag>(Parameter::common);

    set.set<Parameter::common>(common);

    ASSERT_NO_FATAL_FAILURE(setAndGetParameter(id, Parameter::make<Parameter::common>(common)));

    EXPECT_IS_OK(mEffect->setParameter(set));



    Parameter::Id id;

    id.set<Parameter::Id::commonTag>(Parameter::common);

    EXPECT_IS_OK(mEffect->getParameter(id, &get));

    EXPECT_EQ(set, get) << set.toString() << " vs " << get.toString();





    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::STOP));

    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::STOP));

    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(close(mEffect));
@@ -439,14 +438,8 @@ TEST_P(AudioEffectTest, SetAndGetParameterInIdle) { 




    Parameter::Common common = EffectHelper::createParamCommon(

    Parameter::Common common = EffectHelper::createParamCommon(

            0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */);

            0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */);

    Parameter get = Parameter(), set = Parameter();

    Parameter::Id id = Parameter::Id::make<Parameter::Id::commonTag>(Parameter::common);

    set.set<Parameter::common>(common);

    ASSERT_NO_FATAL_FAILURE(setAndGetParameter(id, Parameter::make<Parameter::common>(common)));

    EXPECT_IS_OK(mEffect->setParameter(set));



    Parameter::Id id;

    id.set<Parameter::Id::commonTag>(Parameter::common);

    EXPECT_IS_OK(mEffect->getParameter(id, &get));

    EXPECT_EQ(set, get) << set.toString() << " vs " << get.toString();





    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));
@@ -461,18 +454,11 @@ TEST_P(AudioEffectTest, SetAndGetParameterAfterStop) { 




    Parameter::Common common = EffectHelper::createParamCommon(

    Parameter::Common common = EffectHelper::createParamCommon(

            0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */);

            0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */);

    Parameter get = Parameter(), set = Parameter();

    Parameter::Id id = Parameter::Id::make<Parameter::Id::commonTag>(Parameter::common);

    set.set<Parameter::common>(common);

    ASSERT_NO_FATAL_FAILURE(setAndGetParameter(id, Parameter::make<Parameter::common>(common)));

    EXPECT_IS_OK(mEffect->setParameter(set));





    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::STOP));

    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::STOP));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::IDLE));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::IDLE));



    Parameter::Id id;

    id.set<Parameter::Id::commonTag>(Parameter::common);

    EXPECT_IS_OK(mEffect->getParameter(id, &get));

    EXPECT_EQ(set, get) << set.toString() << " vs " << get.toString();



    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));

}

}
@@ -487,21 +473,102 @@ TEST_P(AudioEffectTest, SetAndGetParameterAfterReset) { 




    Parameter::Common common = EffectHelper::createParamCommon(

    Parameter::Common common = EffectHelper::createParamCommon(

            0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */);

            0 /* session */, 1 /* ioHandle */, 44100 /* iSampleRate */, 44100 /* oSampleRate */);

    Parameter get = Parameter(), set = Parameter();

    Parameter::Id id = Parameter::Id::make<Parameter::Id::commonTag>(Parameter::common);

    set.set<Parameter::common>(common);

    ASSERT_NO_FATAL_FAILURE(setAndGetParameter(id, Parameter::make<Parameter::common>(common)));

    EXPECT_IS_OK(mEffect->setParameter(set));





    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::RESET));

    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::RESET));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::IDLE));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::IDLE));





    Parameter::Id id;

    ASSERT_NO_FATAL_FAILURE(setAndGetParameter(id, Parameter::make<Parameter::common>(common)));

    id.set<Parameter::Id::commonTag>(Parameter::common);



    EXPECT_IS_OK(mEffect->getParameter(id, &get));

    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::STOP));

    EXPECT_EQ(set, get) << set.toString() << " vs " << get.toString();

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::IDLE));

    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));

}



// Set and get AudioDeviceDescription in Parameter

TEST_P(AudioEffectTest, SetAndGetParameterDeviceDescription) {

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

    ASSERT_NO_FATAL_FAILURE(open(mEffect));



    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::START));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::PROCESSING));



    std::vector<AudioDeviceDescription> deviceDescs = {

            {.type = AudioDeviceType::IN_DEFAULT,

             .connection = AudioDeviceDescription::CONNECTION_ANALOG},

            {.type = AudioDeviceType::IN_DEVICE,

             .connection = AudioDeviceDescription::CONNECTION_BT_A2DP}};

    Parameter::Id id = Parameter::Id::make<Parameter::Id::commonTag>(Parameter::deviceDescription);

    ASSERT_NO_FATAL_FAILURE(

            setAndGetParameter(id, Parameter::make<Parameter::deviceDescription>(deviceDescs)));





    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::STOP));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::IDLE));

    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));

}

}



// Set and get AudioMode in Parameter

TEST_P(AudioEffectTest, SetAndGetParameterAudioMode) {

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

    ASSERT_NO_FATAL_FAILURE(open(mEffect));



    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::START));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::PROCESSING));



    Parameter::Id id = Parameter::Id::make<Parameter::Id::commonTag>(Parameter::mode);

    ASSERT_NO_FATAL_FAILURE(

            setAndGetParameter(id, Parameter::make<Parameter::mode>(AudioMode::NORMAL)));

    ASSERT_NO_FATAL_FAILURE(

            setAndGetParameter(id, Parameter::make<Parameter::mode>(AudioMode::IN_COMMUNICATION)));



    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::STOP));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::IDLE));

    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));

}



// Set and get AudioSource in Parameter

TEST_P(AudioEffectTest, SetAndGetParameterAudioSource) {

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

    ASSERT_NO_FATAL_FAILURE(open(mEffect));



    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::START));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::PROCESSING));



    Parameter::Id id = Parameter::Id::make<Parameter::Id::commonTag>(Parameter::source);

    ASSERT_NO_FATAL_FAILURE(

            setAndGetParameter(id, Parameter::make<Parameter::source>(AudioSource::DEFAULT)));

    ASSERT_NO_FATAL_FAILURE(setAndGetParameter(

            id, Parameter::make<Parameter::source>(AudioSource::VOICE_RECOGNITION)));



    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::STOP));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::IDLE));

    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));

}



// Set and get VolumeStereo in Parameter

TEST_P(AudioEffectTest, SetAndGetParameterVolume) {

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

    ASSERT_NO_FATAL_FAILURE(open(mEffect));



    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::START));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::PROCESSING));



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



    ASSERT_NO_FATAL_FAILURE(command(mEffect, CommandId::STOP));

    ASSERT_NO_FATAL_FAILURE(expectState(mEffect, State::IDLE));

    ASSERT_NO_FATAL_FAILURE(close(mEffect));

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));

}



/// Data processing test

/// Data processing test

// Send data to effects and expect it to be consumed by checking statusMQ.

// Send data to effects and expect it to be consumed by checking statusMQ.

TEST_P(AudioEffectTest, ConsumeDataInProcessingState) {

TEST_P(AudioEffectTest, ConsumeDataInProcessingState) {