commit 97ef497ccfcd9167345d5a9a2052778dd1dc823f
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 21 06:31:29 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 21 06:31:29 2022 +0000
tree 7f5b1cc6ccad3f29b19156e2a2d3837a3a43ea82
parent ee78c6ef2eea34bbc3cfa578692564e8a3bcf807
parent bf22d2895ee8815a23981f7f97532ba22a8579b0

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

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

Change-Id: I394b42560d7a104e339074628c4835cc2b7b0577
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 de18df89..c1fb956 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;
         }