summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2013-10-30 02:07:56 (GMT)
committerThe Android Automerger <android-build@google.com>2013-11-08 01:04:35 (GMT)
commit301ff06a565c55404e472433c46f506e5bef2ee7 (patch)
treeddb837418727698b18b85d025be8503fdfb2de6a
parent7d1e2245d443faaf833c19e7e9c837112d618c68 (diff)
downloadandroid_frameworks_ex-301ff06a565c55404e472433c46f506e5bef2ee7.zip
android_frameworks_ex-301ff06a565c55404e472433c46f506e5bef2ee7.tar.gz
android_frameworks_ex-301ff06a565c55404e472433c46f506e5bef2ee7.tar.bz2
camera2: Add updateCaptureRequest method
It can be used to update repeating request with current auto focus mode. Bug: 10649854 Change-Id: I5e92218c61dea04990581d37f92bf25a1f8dbe91
-rw-r--r--camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java21
1 files changed, 21 insertions, 0 deletions
diff --git a/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java b/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
index 23959e4..500fb12 100644
--- a/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
+++ b/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
@@ -366,4 +366,25 @@ public class AutoFocusStateMachine {
SysTrace.endSectionAsync(mCurrentAfTrace, mCurrentAfCookie);
mCurrentAfCookie = AF_UNINITIALIZED;
}
+
+ /**
+ * Update the repeating request with current focus mode.
+ *
+ * <p>This is typically used when a new repeating request is created to update preview with
+ * new metadata (i.e. crop region). The current auto focus mode needs to be carried over for
+ * correct auto focus behavior.<p>
+ *
+ * @param repeatingBuilder Builder for a repeating request.
+ */
+ public synchronized void updateCaptureRequest(CaptureRequest.Builder repeatingBuilder) {
+ if (repeatingBuilder == null) {
+ throw new IllegalArgumentException("repeatingBuilder shouldn't be null");
+ }
+
+ if (mCurrentAfMode == AF_UNINITIALIZED) {
+ throw new IllegalStateException("AF mode was not enabled");
+ }
+
+ repeatingBuilder.set(CaptureRequest.CONTROL_AF_MODE, mCurrentAfMode);
+ }
}