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

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

Merge "libstagefright: Use ATRACE_INT64 for 64bit fields" am: b2240ff5 am:... 

Merge "libstagefright: Use ATRACE_INT64 for 64bit fields" am: b2240ff5 am: ad2a03d9 am: ceebdf75 am: 8f9173f4

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



Change-Id: I954e943e94aa178e8d8e425e54f4e6dad7b0bc78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e8de344 8f9173f4

media/libstagefright/VideoFrameSchedulerBase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ nsecs_t VideoFrameSchedulerBase::schedule(nsecs_t renderTime) { 
                return origRenderTime;

            }



            ATRACE_INT("FRAME_VSYNCS", vsyncsForLastFrame);

            ATRACE_INT64("FRAME_VSYNCS", vsyncsForLastFrame);

        }

        mLastVsyncTime = nextVsyncTime;

    }
@@ -460,7 +460,7 @@ nsecs_t VideoFrameSchedulerBase::schedule(nsecs_t renderTime) { 
    renderTime -= (renderTime - mVsyncTime) % mVsyncPeriod;

    renderTime += mVsyncPeriod / 2;

    ALOGV("adjusting render: %lld => %lld", (long long)origRenderTime, (long long)renderTime);

    ATRACE_INT("FRAME_FLIP_IN(ms)", (renderTime - now) / 1000000);

    ATRACE_INT64("FRAME_FLIP_IN(ms)", (renderTime - now) / 1000000);

    return renderTime;

}