diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-09-20 01:06:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-20 01:06:55 +0000 |
| commit | d3b7327c38964773453a861099c74f547aab9662 (patch) | |
| tree | 34315d660a54e39c2e1da6bdaa6914c8bc99b0e0 /services | |
| parent | 3bde6b1c3387c51479f39846533ead246a920990 (diff) | |
| parent | 43e2418e30c360cdd43052fb3471433161cc161e (diff) | |
| download | frameworks_av-d3b7327c38964773453a861099c74f547aab9662.zip frameworks_av-d3b7327c38964773453a861099c74f547aab9662.tar.gz frameworks_av-d3b7327c38964773453a861099c74f547aab9662.tar.bz2 | |
Merge "API1: ZSL buffers should be skipped for manual AF mode" into lmp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp b/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp index de31e23..f110b66 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)) { |