diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-04-10 11:42:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:42:15 -0700 |
| commit | 08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c (patch) | |
| tree | 4fed99924b11236a3ac616b84bfa12071626a0a6 /include | |
| parent | 67d6590d242397acbb95814139301d2e6efd3631 (diff) | |
| parent | c58b42327df5fbc826e2fcc2674ab6db0edfcd92 (diff) | |
| download | frameworks_base-08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c.zip frameworks_base-08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c.tar.gz frameworks_base-08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c.tar.bz2 | |
am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92' into froyo-plus-aosp
* commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92':
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/CameraParameters.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index a7568d7..3b0e9e5 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -289,6 +289,9 @@ public: static const char SCENE_MODE_SPORTS[]; static const char SCENE_MODE_PARTY[]; static const char SCENE_MODE_CANDLELIGHT[]; + // Applications are looking for a barcode. Camera driver will be optimized + // for barcode reading. + static const char SCENE_MODE_BARCODE[]; // Formats for setPreviewFormat and setPictureFormat. static const char PIXEL_FORMAT_YUV422SP[]; @@ -309,6 +312,10 @@ public: // focus, which is usually at hyperfocal distance. Applications should // not call CameraHardwareInterface.autoFocus in this mode. static const char FOCUS_MODE_FIXED[]; + // Extended depth of field (EDOF). Focusing is done digitally and + // continuously. Applications should not call + // CameraHardwareInterface.autoFocus in this mode. + static const char FOCUS_MODE_EDOF[]; private: DefaultKeyedVector<String8,String8> mMap; |