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

Commit b7c00502 authored by Sungtak Lee's avatar Sungtak Lee Committed by Automerger Merge Worker
Browse files

Merge "Codec2: Check errno during syscall (FUTEX_WAIT) failure in fence.wait"... 

Merge "Codec2: Check errno during syscall (FUTEX_WAIT) failure in fence.wait" am: 49570ff4 am: b6a26b20 am: 48b85bf9

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



Change-Id: I7c15d001be5cca5ff7f09adcca24bf7f43ba32ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 216d2187 48b85bf9

media/codec2/vndk/platform/C2SurfaceSyncObj.cpp

+2 −2
Original line number Diff line number Diff line
@@ -228,10 +228,10 @@ c2_status_t C2SyncVariables::waitForChange(uint32_t waitId, c2_nsecs_t timeoutNs 
    tv.tv_nsec = timeoutNs % 1000000000;



    int ret =  syscall(__NR_futex, &mCond, FUTEX_WAIT, waitId, &tv, NULL, 0);

    if (ret == 0 || ret == EAGAIN) {

    if (ret == 0 || errno == EAGAIN) {

        return C2_OK;

    }

    if (ret == EINTR || ret == ETIMEDOUT) {

    if (errno == EINTR || errno == ETIMEDOUT) {

        return C2_TIMED_OUT;

    }

    return C2_BAD_VALUE;