diff options
| author | Mansoor Aftab <maftab@codeaurora.org> | 2013-05-22 12:19:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-22 12:19:26 -0700 |
| commit | 65e218ee5249d722a1af0bab6546709f3de62f8c (patch) | |
| tree | 211f3edd0aea8b1817982e211bf2250f77df7749 /services/camera | |
| parent | b352cec448530db8b4ba9f121d8ac9462702c1cf (diff) | |
| parent | 1d60db8bfce9becee9d101eacc58e2a673221622 (diff) | |
| download | frameworks_av-65e218ee5249d722a1af0bab6546709f3de62f8c.zip frameworks_av-65e218ee5249d722a1af0bab6546709f3de62f8c.tar.gz frameworks_av-65e218ee5249d722a1af0bab6546709f3de62f8c.tar.bz2 | |
am 1d60db8b: am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp
* commit '1d60db8bfce9becee9d101eacc58e2a673221622':
Camera3: Fix Bug minTimestamp is never greater than frame timestamp
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/camera2/ZslProcessor3.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp index defcafc..e2c120c 100644 --- a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp +++ b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp @@ -384,7 +384,7 @@ nsecs_t ZslProcessor3::getCandidateTimestampLocked(size_t* metadataIdx) const { continue; } nsecs_t frameTimestamp = entry.data.i64[0]; - if (minTimestamp > frameTimestamp) { + if (minTimestamp > frameTimestamp || minTimestamp == -1) { entry = frame.find(ANDROID_CONTROL_AE_STATE); if (entry.count == 0) { |