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

Commit 6491d72d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Camera: Fix ZSL_STILL_CAPTURE condition"

parents 8ce15a60 828ade30

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -469,7 +469,7 @@ void removeInFlightRequestIfReadyLocked(CaptureOutputStates& states, int idx) { 
        // Note down the just completed frame number

        // Note down the just completed frame number

        if (request.hasInputBuffer) {

        if (request.hasInputBuffer) {

            states.lastCompletedReprocessFrameNumber = frameNumber;

            states.lastCompletedReprocessFrameNumber = frameNumber;

        } else if (request.zslCapture) {

        } else if (request.zslCapture && request.stillCapture) {

            states.lastCompletedZslFrameNumber = frameNumber;

            states.lastCompletedZslFrameNumber = frameNumber;

        } else {

        } else {

            states.lastCompletedRegularFrameNumber = frameNumber;

            states.lastCompletedRegularFrameNumber = frameNumber;
@@ -941,7 +941,8 @@ void returnOutputBuffers( 
void returnAndRemovePendingOutputBuffers(bool useHalBufManager,

void returnAndRemovePendingOutputBuffers(bool useHalBufManager,

        sp<NotificationListener> listener, InFlightRequest& request,

        sp<NotificationListener> listener, InFlightRequest& request,

        SessionStatsBuilder& sessionStatsBuilder) {

        SessionStatsBuilder& sessionStatsBuilder) {

    bool timestampIncreasing = !(request.zslCapture || request.hasInputBuffer);

    bool timestampIncreasing =

            !((request.zslCapture && request.stillCapture) || request.hasInputBuffer);

    returnOutputBuffers(useHalBufManager, listener,

    returnOutputBuffers(useHalBufManager, listener,

            request.pendingOutputBuffers.array(),

            request.pendingOutputBuffers.array(),

            request.pendingOutputBuffers.size(),

            request.pendingOutputBuffers.size(),