commit 80ae353d5d96dd3864f708b929778721a9067475
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 15 01:21:35 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 15 01:21:35 2020 +0000
tree d04a783c4d9cf9858d217c682f6d41ad41fda905
parent 298eb79cf0d6a32d8321fdf1eb88f4db157ae195
parent fd2e17865a19f95affac27b8a6a055a627946398

Merge "Separate timestamps in AdaptiveDecodeTest" am: fd2e17865a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9aeee9f57d977fccf9a563000e85598f7641e680

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

diff --git a/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp b/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp
index 12ed725..b520c17 100644
--- a/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp
+++ b/media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp
@@ -734,7 +734,7 @@
             }
             if (timestampMax < timestamp) timestampMax = timestamp;
         }
-        timestampOffset = timestampMax;
+        timestampOffset = timestampMax + 33333;
         eleInfo.close();
 
         // Reset Total frames before second decode loop