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

Commit 99c03588 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Camera: reset presentation timestamp more aggressively am: ed08fbe1 

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



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

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

+15 −4
Original line number Diff line number Diff line
@@ -1432,16 +1432,27 @@ nsecs_t Camera3OutputStream::syncTimestampToDisplayLocked(nsecs_t t) { 
    int minVsyncs = (mMinExpectedDuration - vsyncEventData.frameInterval / 2) /

            vsyncEventData.frameInterval;

    if (minVsyncs < 0) minVsyncs = 0;

    nsecs_t minInterval = minVsyncs * vsyncEventData.frameInterval + kTimelineThresholdNs;

    // Find best timestamp in the vsync timeline:

    nsecs_t minInterval = minVsyncs * vsyncEventData.frameInterval;

    // Find best timestamp in the vsync timelines:

    // - Only use at most 3 timelines to avoid long latency

    // - closest to the ideal present time,

    // - deadline timestamp is greater than the current time, and

    // - the candidate present time is at least minInterval in the future

    //   compared to last present time.

    for (const auto& vsyncTime : vsyncEventData.frameTimelines) {

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

    float biasForShortDelay = 1.0f;

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

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

        if (minVsyncs > 0) {

            // Bias towards using smaller timeline index:

            //   i = 0:                bias = 1

            //   i = maxTimelines-1:   bias = -1

            biasForShortDelay = 1.0 - 2.0 * i / (maxTimelines - 1);

        }

        if (std::abs(vsyncTime.expectedPresentationTime - idealPresentT) < minDiff &&

                vsyncTime.deadlineTimestamp >= currentTime &&

                vsyncTime.expectedPresentationTime > mLastPresentTime + minInterval) {

                vsyncTime.expectedPresentationTime >

                mLastPresentTime + minInterval + biasForShortDelay * kTimelineThresholdNs) {

            expectedPresentT = vsyncTime.expectedPresentationTime;

            minDiff = std::abs(vsyncTime.expectedPresentationTime - idealPresentT);

        }

services/camera/libcameraservice/device3/Camera3OutputStream.h

+2 −1
Original line number Diff line number Diff line
@@ -421,9 +421,10 @@ class Camera3OutputStream : 
    nsecs_t mLastPresentTime = 0;

    nsecs_t mCaptureToPresentOffset = 0;

    static constexpr size_t kDisplaySyncExtraBuffer = 2;

    static constexpr nsecs_t kSpacingResetIntervalNs = 1000000000LL; // 1 second

    static constexpr nsecs_t kSpacingResetIntervalNs = 50000000LL; // 50 millisecond

    static constexpr nsecs_t kTimelineThresholdNs = 1000000LL; // 1 millisecond

    static constexpr float kMaxIntervalRatioDeviation = 0.05f;

    static constexpr int kMaxTimelines = 3;

    nsecs_t syncTimestampToDisplayLocked(nsecs_t t);



    // Re-space frames by delaying queueBuffer so that frame delivery has