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

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

Merge "media.c2 aidl: fix timeout calculation of pipe based C2Fence" into main... 

Merge "media.c2 aidl: fix timeout calculation of pipe based C2Fence" into main am: 405f626e am: 7503659b

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



Change-Id: Ie955ebb9565aa41dc88c0c8a492ccca46aff81be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f12ee8ad 7503659b

media/codec2/vndk/C2Fence.cpp

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ private: 
        struct timespec ts;

        if (timeoutNs >= 0) {

            ts.tv_sec = int(timeoutNs / 1000000000);

            ts.tv_nsec = timeoutNs;

            ts.tv_nsec = timeoutNs % 1000000000;

        } else {

            ALOGD("polling for indefinite duration requested, but changed to wait for %d sec",

                  kPipeFenceWaitLimitSecs);