summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMansoor Aftab <maftab@codeaurora.org>2013-05-21 18:58:53 -0700
committerIgor Murashkin <iam@google.com>2013-05-22 12:05:22 -0700
commitc2c874d88df1b4be52f5415de6606785691bba1f (patch)
treeafaa66934b4866af50eaa6d03bf42e3c34ffea7b /services
parentf21daf4718bbd5662eae843f5a56e039bd34a2f4 (diff)
downloadframeworks_av-c2c874d88df1b4be52f5415de6606785691bba1f.zip
frameworks_av-c2c874d88df1b4be52f5415de6606785691bba1f.tar.gz
frameworks_av-c2c874d88df1b4be52f5415de6606785691bba1f.tar.bz2
Camera3: Fix Bug minTimestamp is never greater than frame timestamp
Bug in logic since minTimestamp is initialized to -1, and this needs to be updated for the first frame atleast for logic to work correctly for subsequent frames. Bug: 9007356 Change-Id: I70edc4d9f34ff67a141c027c67396dc2ca9e413a Signed-off-by: Igor Murashkin <iam@google.com>
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/camera2/ZslProcessor3.cpp2
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) {