diff options
| author | Wei Huang <weih@google.com> | 2011-09-23 10:05:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-23 10:05:22 -0700 |
| commit | 0f0fed65815cdf083f70d723b3001a5dbd1837db (patch) | |
| tree | 9a1f16368db040e63102136b1632b8261e66864f | |
| parent | 3d5ec85e29edfa0639290610044517bec269c7df (diff) | |
| parent | b050002245f1606697488ddf5516e992d0c380be (diff) | |
| download | frameworks_av-0f0fed65815cdf083f70d723b3001a5dbd1837db.zip frameworks_av-0f0fed65815cdf083f70d723b3001a5dbd1837db.tar.gz frameworks_av-0f0fed65815cdf083f70d723b3001a5dbd1837db.tar.bz2 | |
am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
Update camera javadoc about AE and AWB lock.
| -rw-r--r-- | include/camera/CameraParameters.h | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 4a4bcfb..a520a6a 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -317,18 +317,13 @@ public: // recalculate exposure values). Changing exposure compensation // settings will still affect the exposure settings while // auto-exposure is locked. Stopping preview or taking a still - // image will release the lock. However, the lock can be - // re-enabled prior to preview being re-started, to keep the - // exposure values from the previous lock. In conjunction with + // image will not change the lock. In conjunction with // exposure compensation, this allows for capturing multi-exposure // brackets with known relative exposure values. Locking // auto-exposure after open but before the first call to // startPreview may result in severely over- or under-exposed - // images. The driver may independently enable the AE lock after - // auto-focus completes. If it does so, this key must have its - // value updated to reflect the lock's existence. Applications are - // free to release such a lock, to re-enable AE without restarting - // preview. + // images. The driver will not change the AE lock after + // auto-focus completes. static const char KEY_AUTO_EXPOSURE_LOCK[]; // Whether locking the auto-exposure is supported. "true" means it is, and // "false" or this key not existing means it is not supported. @@ -339,18 +334,13 @@ public: // change white balance values. If auto-white balance is already // locked, setting this to true again has no effect (the driver // will not recalculate white balance values). Stopping preview or - // taking a still image will release the lock. However, the lock - // can be re-enabled prior to preview being re-started, to keep - // the white balance values from the previous lock. In conjunction + // taking a still image will not change the lock. In conjunction // with exposure compensation, this allows for capturing // multi-exposure brackets with fixed white balance. Locking // auto-white balance after open but before the first call to // startPreview may result in severely incorrect color. The - // driver may independently enable the AWB lock after auto-focus - // completes. If it does so, this key must have its value updated - // to reflect the lock's existence. Applications are free to - // release such a lock, to re-enable AWB without restarting - // preview. + // driver will not change the AWB lock after auto-focus + // completes. static const char KEY_AUTO_WHITEBALANCE_LOCK[]; // Whether locking the auto-white balance is supported. "true" // means it is, and "false" or this key not existing means it is |