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

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

Merge "Camera: Do not treat non-increasing timestamp as fatal"

parents b5817c55 f7fa2009

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

+1 −2
Original line number Diff line number Diff line
@@ -269,8 +269,7 @@ status_t Camera3OutputStream::returnBufferCheckedLocked( 
        }



        if (timestamp == 0) {

            ALOGE("%s: Stream %d: timestamp shouldn't be 0", __FUNCTION__, mId);

            return BAD_VALUE;

            ALOGW("%s: Stream %d: timestamp shouldn't be 0", __FUNCTION__, mId);

        }



        /* Certain consumers (such as AudioSource or HardwareComposer) use

services/camera/libcameraservice/device3/Camera3Stream.cpp

+1 −2
Original line number Diff line number Diff line
@@ -663,9 +663,8 @@ status_t Camera3Stream::returnBuffer(const camera3_stream_buffer &buffer, 
    removeOutstandingBuffer(buffer);



    if (timestampIncreasing && timestamp != 0 && timestamp <= mLastTimestamp) {

        ALOGE("%s: Stream %d: timestamp %" PRId64 " is not increasing. Prev timestamp %" PRId64,

        ALOGW("%s: Stream %d: timestamp %" PRId64 " is not increasing. Prev timestamp %" PRId64,

                __FUNCTION__, mId, timestamp, mLastTimestamp);

        return BAD_VALUE;

    }

    mLastTimestamp = timestamp;