diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-06 11:45:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-06 11:45:04 -0700 |
| commit | 582d7468612766cf7b3653f4ad29580307a8686a (patch) | |
| tree | 49fa47b9f4d9d1c7e3631271f1761ce6a32de143 | |
| parent | 4734f5b614340c356ccc022ca4476c5cd919022e (diff) | |
| parent | 96150cfc6b9ae93b6c4b60b5c7889a7a90af5def (diff) | |
| download | frameworks_av-582d7468612766cf7b3653f4ad29580307a8686a.zip frameworks_av-582d7468612766cf7b3653f4ad29580307a8686a.tar.gz frameworks_av-582d7468612766cf7b3653f4ad29580307a8686a.tar.bz2 | |
am 96150cfc: Camera2: Move locked states out of AE/AWB mode
* commit '96150cfc6b9ae93b6c4b60b5c7889a7a90af5def':
Camera2: Move locked states out of AE/AWB mode
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 1cad2ae..f89d1e3 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -1336,11 +1336,15 @@ status_t Parameters::updateRequest(CameraMetadata *request) const { previewFpsRange, 2); if (res != OK) return res; - uint8_t reqWbMode = autoWhiteBalanceLock ? - (uint8_t)ANDROID_CONTROL_AWB_LOCKED : wbMode; res = request->update(ANDROID_CONTROL_AWB_MODE, - &reqWbMode, 1); + &wbMode, 1); if (res != OK) return res; + + uint8_t reqWbLock = autoWhiteBalanceLock ? + ANDROID_CONTROL_AWB_LOCK_ON : ANDROID_CONTROL_AWB_LOCK_OFF; + res = request->update(ANDROID_CONTROL_AWB_LOCK, + &reqWbLock, 1); + res = request->update(ANDROID_CONTROL_EFFECT_MODE, &effectMode, 1); if (res != OK) return res; @@ -1380,8 +1384,6 @@ status_t Parameters::updateRequest(CameraMetadata *request) const { cameraId, flashMode); return BAD_VALUE; } - if (autoExposureLock) reqAeMode = ANDROID_CONTROL_AE_LOCKED; - res = request->update(ANDROID_FLASH_MODE, &reqFlashMode, 1); if (res != OK) return res; @@ -1389,6 +1391,11 @@ status_t Parameters::updateRequest(CameraMetadata *request) const { &reqAeMode, 1); if (res != OK) return res; + uint8_t reqAeLock = autoExposureLock ? + ANDROID_CONTROL_AE_LOCK_ON : ANDROID_CONTROL_AE_LOCK_OFF; + res = request->update(ANDROID_CONTROL_AE_LOCK, + &reqAeLock, 1); + float reqFocusDistance = 0; // infinity focus in diopters uint8_t reqFocusMode; switch (focusMode) { |