commit 83d4e6ebdd6faa8050c3fc175c92aba4f4c675f7
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 15 02:01:04 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 15 02:01:04 2020 +0000
tree 201e968cacb35af03aa64dd2d5e444046f779522
parent 375eb523e5249247f7bce493e377413eda62831f
parent 80ae353d5d96dd3864f708b929778721a9067475

Merge "Separate timestamps in AdaptiveDecodeTest" am: fd2e17865a am: 80ae353d5d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6c8dcc45b87f7ca9d5589a1fa3c54e8b9cc7742

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