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

Commit 98d966f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix ZSL_STILL_CAPTURE condition" am: 6491d72d am: 144f6546... 

Merge "Camera: Fix ZSL_STILL_CAPTURE condition" am: 6491d72d am: 144f6546 am: 13e7dc31 am: eb72c95c

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

Change-Id: Ic8519fc1a7f258772ac2961a96285a84fd3d6183
parents bb1d6041 eb72c95c

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

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

        if (request.hasInputBuffer) {

            states.lastCompletedReprocessFrameNumber = frameNumber;

        } else if (request.zslCapture) {

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

            states.lastCompletedZslFrameNumber = frameNumber;

        } else {

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

        sp<NotificationListener> listener, InFlightRequest& request,

        SessionStatsBuilder& sessionStatsBuilder) {

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

    bool timestampIncreasing =

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

    returnOutputBuffers(useHalBufManager, listener,

            request.pendingOutputBuffers.array(),

            request.pendingOutputBuffers.size(),