commit ebb435d1c00bf4d54cb5477d38930ce5b47d0596
author TreeHugger Robot <treehugger-gerrit@google.com> Sat May 30 02:12:38 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 30 02:12:38 2020 +0000
tree 4c20dd1a2baac2606ca7510aaa92f99c88ca0b35
parent 605ba4b8828679f40661cd9dc05cb85a0386dbfe
parent f3db435b372ef5e0d19948c4874d940b3c31f88d

Merge "Revert "VTS: validate CSD is not received from h263 encoder"" into rvc-dev am: d40bc7615f am: f3db435b37

Change-Id: I6b1b9a2dec5a3192342738b6f1a50e13a28c338f

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

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 6fac4c8..9e425d2 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,11 +510,11 @@
         ASSERT_TRUE(false);
     }
 
-    if (!mCsd && (mCompName != vp8 && mCompName != vp9 && mCompName != h263)) {
+    if (!mCsd && (mCompName != vp8 && mCompName != vp9)) {
         ASSERT_TRUE(false) << "CSD Buffer not received";
     }
 
-    if (mCsd && (mCompName == vp8 || mCompName == vp9 || mCompName == h263)) {
+    if (mCsd && (mCompName == vp8 || mCompName == vp9)) {
         ASSERT_TRUE(false) << "CSD Buffer not expected";
     }