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

Commit 6f35bbca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "VTS: update CSD validation for Video Encoder Test" into rvc-dev am: a2f1aa93 

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

Change-Id: I033b254901dedcd8ec2ee1488839bb2070c93dd3
parents 7fd59c71 a2f1aa93

media/codec2/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.cpp

+4 −1
Original line number Diff line number Diff line
@@ -92,7 +92,10 @@ void workDone(const std::shared_ptr<android::Codec2Client::Component>& component 
        for (size_t i = 0; i < updates.size(); ++i) {

            C2Param* param = updates[i].get();

            if (param->index() == C2StreamInitDataInfo::output::PARAM_TYPE) {

                csd = true;

                C2StreamInitDataInfo::output* csdBuffer =

                        (C2StreamInitDataInfo::output*)(param);

                size_t csdSize = csdBuffer->flexCount();

                if (csdSize > 0) csd = true;

            } else if ((param->index() == C2StreamSampleRateInfo::output::PARAM_TYPE) ||

                       (param->index() == C2StreamChannelCountInfo::output::PARAM_TYPE) ||

                       (param->index() == C2StreamPictureSizeInfo::output::PARAM_TYPE)) {

media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp

+4 −6
Original line number Diff line number Diff line
@@ -510,12 +510,10 @@ TEST_P(Codec2VideoEncEncodeTest, EncodeTest) { 
        ASSERT_TRUE(false);

    }



    if (!mCsd && (mCompName != vp8 && mCompName != vp9)) {

        ASSERT_TRUE(false) << "CSD Buffer not received";

    }



    if (mCsd && (mCompName == vp8 || mCompName == vp9)) {

        ASSERT_TRUE(false) << "CSD Buffer not expected";

    if (mCompName == vp8 || mCompName == h263) {

        ASSERT_FALSE(mCsd) << "CSD Buffer not expected";

    } else if (mCompName != vp9) {

        ASSERT_TRUE(mCsd) << "CSD Buffer not received";

    }



    if (mTimestampDevTest) EXPECT_EQ(mTimestampUslist.empty(), true);