commit f3db435b372ef5e0d19948c4874d940b3c31f88d
author TreeHugger Robot <treehugger-gerrit@google.com> Sat May 30 02:00:10 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 30 02:00:10 2020 +0000
tree a79676756b6f03d94f19c4bae518277a350d696c
parent ec5023ff399f588cf37f772b53db71ef396ce02d
parent d40bc7615ff9bb6aac308083c51980437a9c6a21

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

Change-Id: I6c274e3249475ba9d1095b592706364c832b8c97

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";
     }