diff options
author | Zhijun He <zhijunhe@google.com> | 2013-11-07 21:19:02 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-07 21:19:02 +0000 |
commit | 020e6d9bb46850ad39f14e575259a04887a2ea26 (patch) | |
tree | ddb837418727698b18b85d025be8503fdfb2de6a | |
parent | e2fa3d7185929f5e51a851d23db2618a41f18d9d (diff) | |
parent | d4429271623c05376ee1445d13fde9bcf76a0033 (diff) | |
download | android_frameworks_ex-020e6d9bb46850ad39f14e575259a04887a2ea26.tar.gz android_frameworks_ex-020e6d9bb46850ad39f14e575259a04887a2ea26.tar.bz2 android_frameworks_ex-020e6d9bb46850ad39f14e575259a04887a2ea26.zip |
Merge "camera2: Add updateCaptureRequest method" into klp-dev
-rw-r--r-- | camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java | 21 |
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); + } } |