From 43e2418e30c360cdd43052fb3471433161cc161e Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Fri, 19 Sep 2014 15:51:04 -0700 Subject: [PATCH] API1: ZSL buffers should be skipped for manual AF mode ZSL counts on good auto focus (CAF). It is really tricky to enable ZSL for manual focus mode. as it is bascically a locked focus mode, you can not tell if the focus is good or not by reading the afstate. Bug: 17577928 Change-Id: I68ff7d143e7d56f942bb00a8da6a9faea57b52a0 --- services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp b/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp index de31e23d2e..f110b66fdf 100644 --- a/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp +++ b/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp @@ -573,6 +573,11 @@ nsecs_t ZslProcessor3::getCandidateTimestampLocked(size_t* metadataIdx) const { continue; } uint8_t afMode = entry.data.u8[0]; + if (afMode == ANDROID_CONTROL_AF_MODE_OFF) { + // Skip all the ZSL buffer for manual AF mode, as we don't really + // know the af state. + continue; + } // Check AF state if device has focuser and focus mode isn't fixed if (mHasFocuser && !isFixedFocusMode(afMode)) { -- 2.11.0