commit 2274549ec18f63a285db871fa67abf42124d116e
author Eino-Ville Talvala <etalvala@google.com> Mon Sep 17 17:55:07 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Tue Sep 18 10:55:03 2012 -0700
tree cf031f7fb2377e900d96434e7b19685b30d58f76
parent 9585b06fdaff8a8168ea186a76853f65218fc697

Camera2: ZSL: Do regular capture if AE is not satisfied.

- Check the AE state of the selected ZSL buffer; if it's not reporting
  as CONVERGED or LOCKED, fall back to normal capture sequence
- Add more debugging for the ZSL queue.

Bug: 6910087
Change-Id: I77a4287580aa9ddbd58438477c40ce829555d0ca

services/camera/libcameraservice/camera2/CaptureSequencer.cpp

diff --git a/services/camera/libcameraservice/camera2/CaptureSequencer.cpp b/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
index 981fdb4..eb9eb5b 100644
--- a/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
+++ b/services/camera/libcameraservice/camera2/CaptureSequencer.cpp
@@ -274,8 +274,14 @@
     // TODO: Actually select the right thing here.
     res = processor->pushToReprocess(mCaptureId);
     if (res != OK) {
-        ALOGW("%s: Camera %d: Failed to use ZSL queue, falling back to standard capture",
-                __FUNCTION__, client->getCameraId());
+        if (res == NOT_ENOUGH_DATA) {
+            ALOGV("%s: Camera %d: ZSL queue doesn't have good frame, "
+                    "falling back to normal capture", __FUNCTION__,
+                    client->getCameraId());
+        } else {
+            ALOGE("%s: Camera %d: Error in ZSL queue: %s (%d)",
+                    __FUNCTION__, client->getCameraId(), strerror(-res), res);
+        }
         return STANDARD_START;
     }