commit e3e3bc93469fa7fc0d2faecdff1635e5ebb9e48e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Sep 06 17:43:23 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 06 17:43:23 2023 +0000
tree 256cc4f7002e94e53565fba6f9af7c2f1b66957b
parent bfc35edec3419e8abf414d5f3530cf45756f1164
parent 5b97e18978469c185bf395072bcc95a042c05d37

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

services/camera/libcameraservice/device3/Camera3Stream.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp
index 23afa6e..701c472 100644
--- a/services/camera/libcameraservice/device3/Camera3Stream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp
@@ -772,7 +772,8 @@
 
     // 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;