commit 372af10f99a13b1602a5b0e94ebcb9bc3e8246c3
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 21 06:50:23 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 21 06:50:23 2022 +0000
tree 65588905f7960bc9d0b731c559e9e57e67b6442a
parent 64742ba78acc7b96ef4954d3b843dbb3e0feab92
parent 97ef497ccfcd9167345d5a9a2052778dd1dc823f

Merge "codec2: Fix nsec to msec conversion in C2Fence" am: bf22d2895e am: 97ef497ccf

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

Change-Id: If90b84c1c4cade5c5fb08bb2c1bae1880a06337b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/codec2/vndk/C2Fence.cpp

diff --git a/media/codec2/vndk/C2Fence.cpp b/media/codec2/vndk/C2Fence.cpp
index 0b556aa..aa908a8 100644
--- a/media/codec2/vndk/C2Fence.cpp
+++ b/media/codec2/vndk/C2Fence.cpp
@@ -186,7 +186,7 @@
 class _C2FenceFactory::SyncFenceImpl : public C2Fence::Impl {
 public:
     virtual c2_status_t wait(c2_nsecs_t timeoutNs) {
-        c2_nsecs_t timeoutMs = timeoutNs / 1000;
+        int64_t timeoutMs = timeoutNs / 1000000;
         if (timeoutMs > INT_MAX) {
             timeoutMs = INT_MAX;
         }