Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd6c3ef3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "codec2: Fix nsec to msec conversion in C2Fence" am: bf22d289 am: 97ef497c am: 372af10f am: 84eec2d3

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



Change-Id: I47249ca1b5377e7cfdccd23aa50fe9bcd965fa5a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ad0d5314 84eec2d3

media/codec2/vndk/C2Fence.cpp

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ using namespace android; 
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;

        }