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

Commit b8e510be authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Gerrit Code Review
Browse files

Merge "Merge "C2 VTS: only InputBufferTest can be skipped for secure codecs"... 

Merge "Merge "C2 VTS: only InputBufferTest can be skipped for secure codecs" into android12-tests-dev am: f00bec8b" into android12L-tests-dev
parents 4e2b1d02 4d37dc61

media/codec2/hidl/1.0/vts/functional/component/VtsHalMediaC2V1_0TargetComponentTest.cpp

+11 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ class Codec2ComponentHidlTestBase : public ::testing::Test { 
  public:

  public:

    virtual void SetUp() override {

    virtual void SetUp() override {

        getParams();

        getParams();

        mDisableTest = false;

        mEos = false;

        mEos = false;

        mClient = android::Codec2Client::CreateFromService(mInstanceName.c_str());

        mClient = android::Codec2Client::CreateFromService(mInstanceName.c_str());

        ASSERT_NE(mClient, nullptr);

        ASSERT_NE(mClient, nullptr);
@@ -73,6 +74,14 @@ class Codec2ComponentHidlTestBase : public ::testing::Test { 
        for (int i = 0; i < MAX_INPUT_BUFFERS; ++i) {

        for (int i = 0; i < MAX_INPUT_BUFFERS; ++i) {

            mWorkQueue.emplace_back(new C2Work);

            mWorkQueue.emplace_back(new C2Work);

        }

        }



        C2SecureModeTuning secureModeTuning{};

        mComponent->query({&secureModeTuning}, {}, C2_MAY_BLOCK, nullptr);

        if (secureModeTuning.value != C2Config::SM_UNPROTECTED) {

            mDisableTest = true;

        }



        if (mDisableTest) std::cout << "[   WARN   ] Test Disabled \n";

    }

    }





    virtual void TearDown() override {

    virtual void TearDown() override {
@@ -105,6 +114,7 @@ class Codec2ComponentHidlTestBase : public ::testing::Test { 
    std::string mInstanceName;

    std::string mInstanceName;

    std::string mComponentName;

    std::string mComponentName;

    bool mEos;

    bool mEos;

    bool mDisableTest;

    std::mutex mQueueLock;

    std::mutex mQueueLock;

    std::condition_variable mQueueCondition;

    std::condition_variable mQueueCondition;

    std::list<std::unique_ptr<C2Work>> mWorkQueue;

    std::list<std::unique_ptr<C2Work>> mWorkQueue;
@@ -324,6 +334,7 @@ class Codec2ComponentInputTests : public Codec2ComponentHidlTestBase, 
};

};





TEST_P(Codec2ComponentInputTests, InputBufferTest) {

TEST_P(Codec2ComponentInputTests, InputBufferTest) {

    if (mDisableTest) GTEST_SKIP() << "Test is disabled";

    description("Tests for different inputs");

    description("Tests for different inputs");





    uint32_t flags = std::get<2>(GetParam());

    uint32_t flags = std::get<2>(GetParam());