| commit | 6f35bbca94fef26cc86d26d487b9059d5d947df2 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 19 21:25:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 19 21:25:30 2020 +0000 |
| tree | 4a424c2a88124dd800507aab60c1e29832859d70 | |
| parent | 7fd59c71bc4045860cf470eaf97c1565ce4cb3a4 [diff] | |
| parent | a2f1aa93d74682f1c9f0a1b69f1a17911ba180b6 [diff] |
Merge "VTS: update CSD validation for Video Encoder Test" into rvc-dev am: a2f1aa93d7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11914378 Change-Id: I033b254901dedcd8ec2ee1488839bb2070c93dd3
diff --git a/media/codec2/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.cpp b/media/codec2/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.cpp index a41c2dc..0251ec2 100644 --- a/media/codec2/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.cpp +++ b/media/codec2/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.cpp
@@ -92,7 +92,10 @@ 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)) {
diff --git a/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp b/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp index 9e425d2..ecaf3a8 100644 --- a/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp +++ b/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp
@@ -510,12 +510,10 @@ 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);