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

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

Merge "Camera: Clean up logging for decreasing timestamp" into main

parents bfc35ede 5b97e189
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -772,7 +772,8 @@ status_t Camera3Stream::returnBuffer(const camera_stream_buffer &buffer,

    // Buffer status may be changed, so make a copy of the stream_buffer struct.
    camera_stream_buffer b = buffer;
    if (timestampIncreasing && timestamp != 0 && timestamp <= mLastTimestamp) {
    if (timestampIncreasing && timestamp != 0 && timestamp <= mLastTimestamp
            && b.status != CAMERA_BUFFER_STATUS_ERROR) {
        ALOGE("%s: Stream %d: timestamp %" PRId64 " is not increasing. Prev timestamp %" PRId64,
                __FUNCTION__, mId, timestamp, mLastTimestamp);
        b.status = CAMERA_BUFFER_STATUS_ERROR;