diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-11-01 04:05:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-01 04:05:45 +0000 |
| commit | 09ebde724b2cd224968d1fdba4f5afd81c998c6a (patch) | |
| tree | ee8ffa76bc6c45e6468645ed65edc4e7565001ba | |
| parent | 841fa37451fb74f3d5978a15aab606bbb67e8c39 (diff) | |
| parent | 2cf981a8e3dcc815e422f21ae4f09e17934906e1 (diff) | |
| download | frameworks_av-09ebde724b2cd224968d1fdba4f5afd81c998c6a.zip frameworks_av-09ebde724b2cd224968d1fdba4f5afd81c998c6a.tar.gz frameworks_av-09ebde724b2cd224968d1fdba4f5afd81c998c6a.tar.bz2 | |
am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '4b6353ea0265bfed52d0637abd1b17596ce25ff0':
Update camera continuous autofocus javadoc.
| -rw-r--r-- | include/camera/CameraParameters.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index ef4cf5c..7edf6b4 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -644,15 +644,17 @@ public: // than FOCUS_MODE_CONTINUOUS_VIDEO. Auto focus starts when the parameter is // set. // - // If applications call CameraHardwareInterface.autoFocus in this mode, the - // focus callback will immediately return with a boolean that indicates - // whether the focus is sharp or not. The apps can then decide if they want - // to take a picture immediately or to change the focus mode to auto, and - // run a full autofocus cycle. The focus position is locked after autoFocus - // call. If applications want to resume the continuous focus, - // cancelAutoFocus must be called. Restarting the preview will not resume - // the continuous autofocus. To stop continuous focus, applications should - // change the focus mode to other modes. + // Applications can call CameraHardwareInterface.autoFocus in this mode. If + // the autofocus is in the middle of scanning, the focus callback will + // return when it completes. If the autofocus is not scanning, focus + // callback will immediately return with a boolean that indicates whether + // the focus is sharp or not. The apps can then decide if they want to take + // a picture immediately or to change the focus mode to auto, and run a full + // autofocus cycle. The focus position is locked after autoFocus call. If + // applications want to resume the continuous focus, cancelAutoFocus must be + // called. Restarting the preview will not resume the continuous autofocus. + // To stop continuous focus, applications should change the focus mode to + // other modes. static const char FOCUS_MODE_CONTINUOUS_PICTURE[]; private: |