diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-09-21 10:44:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 10:44:38 -0700 |
| commit | d276720edb060617168388f44005f0960fa89ad1 (patch) | |
| tree | 5dcf22a0d620dfa8cd06858715b8937c580f6487 /include/camera | |
| parent | 92b328b67a694afc19071c807b80f100663fd5e4 (diff) | |
| parent | 2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd (diff) | |
| download | frameworks_base-d276720edb060617168388f44005f0960fa89ad1.zip frameworks_base-d276720edb060617168388f44005f0960fa89ad1.tar.gz frameworks_base-d276720edb060617168388f44005f0960fa89ad1.tar.bz2 | |
am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Merge commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd'
* commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd':
Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Diffstat (limited to 'include/camera')
| -rw-r--r-- | include/camera/CameraParameters.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 72d5756..705b101 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -383,12 +383,14 @@ public: // continuously. Applications should not call // CameraHardwareInterface.autoFocus in this mode. static const char FOCUS_MODE_EDOF[]; - // 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. To stop continuous - // focus, applications should change the focus mode to other modes. - static const char FOCUS_MODE_CONTINUOUS[]; + // Continuous auto focus mode intended for video recording. The camera + // continuously tries to focus. This is ideal for shooting video. + // Applications still can call CameraHardwareInterface.takePicture in this + // mode but the subject may not be in focus. Auto focus starts when the + // parameter is set. Applications should not call + // CameraHardwareInterface.autoFocus in this mode. To stop continuous focus, + // applications should change the focus mode to other modes. + static const char FOCUS_MODE_CONTINUOUS_VIDEO[]; private: DefaultKeyedVector<String8,String8> mMap; |