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

Commit c78d3e07 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Fix error check for HFR timestamp"

parents 98d51861 403044af

services/camera/libcameraservice/device3/Camera3Device.cpp

+3 −2
Original line number Diff line number Diff line
@@ -2513,8 +2513,9 @@ void Camera3Device::removeInFlightRequestIfReadyLocked(int idx) { 
            (request.haveResultMetadata && shutterTimestamp != 0))) {

        ATRACE_ASYNC_END("frame capture", frameNumber);



        // Sanity check - if sensor timestamp matches shutter timestamp

        if (request.requestStatus == OK &&

        // Sanity check - if sensor timestamp matches shutter timestamp in the

        // case of request having callback.

        if (request.hasCallback && request.requestStatus == OK &&

                sensorTimestamp != shutterTimestamp) {

            SET_ERR("sensor timestamp (%" PRId64

                ") for frame %d doesn't match shutter timestamp (%" PRId64 ")",