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

Commit bfb9d76d authored by Rachel Lee's avatar Rachel Lee Committed by Automerger Merge Worker
Browse files

Merge "Use frameTimelinesLength instead of const" into udc-dev am: c5063521... 

Merge "Use frameTimelinesLength instead of const" into udc-dev am: c5063521 am: 89bde671 am: def15258

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



Change-Id: Idd2fc9a50d5d833b9a6119538c6f3e8d8813dd54
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b88e55dc def15258

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1444,7 +1444,7 @@ nsecs_t Camera3OutputStream::syncTimestampToDisplayLocked(nsecs_t t) { 
    //

    nsecs_t captureInterval = t - mLastCaptureTime;

    if (captureInterval > kSpacingResetIntervalNs) {

        for (size_t i = 0; i < VsyncEventData::kFrameTimelinesLength; i++) {

        for (size_t i = 0; i < vsyncEventData.frameTimelinesLength; i++) {

            const auto& timeline = vsyncEventData.frameTimelines[i];

            if (timeline.deadlineTimestamp >= currentTime &&

                    timeline.expectedPresentationTime > minPresentT) {
@@ -1513,7 +1513,7 @@ nsecs_t Camera3OutputStream::syncTimestampToDisplayLocked(nsecs_t t) { 
    // - For variable FPS, or if the capture interval deviates from refresh

    //   interval for more than 5%, find a presentation time closest to the

    //   (lastPresentationTime + captureToPresentOffset) instead.

    int maxTimelines = std::min(kMaxTimelines, (int)VsyncEventData::kFrameTimelinesLength);

    int maxTimelines = std::min(kMaxTimelines, (int)vsyncEventData.frameTimelinesLength);

    float biasForShortDelay = 1.0f;

    for (int i = 0; i < maxTimelines; i ++) {

        const auto& vsyncTime = vsyncEventData.frameTimelines[i];