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

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

Merge "Add eraser in EffectHalVersionCompatibilityTest" into main am: 9648c2db 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3388142



Change-Id: I84ec7efe9f81d63ed040dd22f98afbbccd9007c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4236123 9648c2db

media/libaudiohal/tests/EffectHalVersionCompatibility_test.cpp

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ static const std::unordered_map<Parameter::Id::Tag, int /* version */> kParamIdE 
        {Parameter::Id::visualizerTag, 1},

        {Parameter::Id::volumeTag, 1},

        {Parameter::Id::spatializerTag, 2},

        {Parameter::Id::eraserTag, 3},

};

// Tags defined Parameter::Specific union.

static const std::unordered_map<Parameter::Specific::Tag, int /* version */>
@@ -104,6 +105,7 @@ static const std::unordered_map<Parameter::Specific::Tag, int /* version */> 
                {Parameter::Specific::visualizer, 1},

                {Parameter::Specific::volume, 1},

                {Parameter::Specific::spatializer, 2},

                {Parameter::Specific::eraser, 3},

};



class MockFactory : public IFactory {
@@ -223,6 +225,7 @@ class MockEffect : public IEffect { 
            case Parameter::Id::virtualizerTag:

            case Parameter::Id::visualizerTag:

            case Parameter::Id::volumeTag:

            case Parameter::Id::eraserTag:

                FALLTHROUGH_INTENDED;

            case Parameter::Id::spatializerTag: {

                if (kParamIdEffectVersionMap.find(idTag) != kParamIdEffectVersionMap.end() &&