commit cd6c3ef30f045dddc63a32c67d2410443d45536e
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 21 07:24:53 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 21 07:24:53 2022 +0000
tree 8f22e0bfebafbc2557fa9a48c4ed787213463e49
parent ad0d531429b0e0fc4a2de5bb6b215489b681c36b
parent 84eec2d3dfd1107af980824587dd185dd95c071f

Merge "codec2: Fix nsec to msec conversion in C2Fence" am: bf22d2895e am: 97ef497ccf am: 372af10f99 am: 84eec2d3df

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

Change-Id: I47249ca1b5377e7cfdccd23aa50fe9bcd965fa5a
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;
         }