diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-18 10:19:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-18 10:19:45 -0700 |
| commit | c86960236d5b2095c87bf46de2400a905acabee2 (patch) | |
| tree | 3eb3e1cf5abf4179bc503f09a66c7a17afc23bae /include | |
| parent | 4dda6ddb25e904c17dcb3012dd229df6ae4692cd (diff) | |
| parent | f008f3ea82a0518375ee4ea41b32451badffbd95 (diff) | |
| download | frameworks_base-c86960236d5b2095c87bf46de2400a905acabee2.zip frameworks_base-c86960236d5b2095c87bf46de2400a905acabee2.tar.gz frameworks_base-c86960236d5b2095c87bf46de2400a905acabee2.tar.bz2 | |
Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/CameraParameters.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 6a5d254..99a3115 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -337,11 +337,14 @@ public: static const char PIXEL_FORMAT_JPEG[]; // Values for focus mode settings. - // Auto-focus mode. + // Auto-focus mode. Applications should call + // CameraHardwareInterface.autoFocus to start the focus in this mode. static const char FOCUS_MODE_AUTO[]; // Focus is set at infinity. Applications should not call // CameraHardwareInterface.autoFocus in this mode. static const char FOCUS_MODE_INFINITY[]; + // Macro (close-up) focus mode. Applications should call + // CameraHardwareInterface.autoFocus to start the focus in this mode. static const char FOCUS_MODE_MACRO[]; // Focus is fixed. The camera is always in this mode if the focus is not // adjustable. If the camera has auto-focus, this mode can fix the @@ -355,7 +358,8 @@ public: // Continuous auto focus mode. The camera continuously tries to focus. This // is ideal for shooting video or shooting photo of moving object. Auto // focus starts when the parameter is set. Applications should not call - // CameraHardwareInterface.autoFocus in this mode. + // CameraHardwareInterface.autoFocus in this mode. To stop continuous + // focus, applications should change the focus mode to other modes. static const char FOCUS_MODE_CONTINUOUS[]; // The camera determines the exposure by giving more weight to the |