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

Commit 36e682a3 authored May 28, 2020 by Manisha Jajoo Committed by Pawin Vongmasa Jun 18, 2020

VTS: update CSD validation for Video Encoder Test

Zero size CSD is considered same as CSD not received.
This patch also updates the CSD check condition for
VP9, VP8 and H263.

Test: atest VtsHalMediaC2V1_0TargetVideoEncTest

Bug: 157572658
Change-Id: I31d1c339065da60a6b8e2e28256399229159d23f

parent 19d51164

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