diff options
| -rw-r--r-- | camera/CameraParameters.cpp | 2 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 76a9715..b50d4d2 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -122,6 +122,7 @@ const char CameraParameters::SCENE_MODE_FIREWORKS[] = "fireworks"; const char CameraParameters::SCENE_MODE_SPORTS[] = "sports"; const char CameraParameters::SCENE_MODE_PARTY[] = "party"; const char CameraParameters::SCENE_MODE_CANDLELIGHT[] = "candlelight"; +const char CameraParameters::SCENE_MODE_BARCODE[] = "barcode"; // Formats for setPreviewFormat and setPictureFormat. const char CameraParameters::PIXEL_FORMAT_YUV422SP[] = "yuv422sp"; @@ -135,6 +136,7 @@ const char CameraParameters::FOCUS_MODE_AUTO[] = "auto"; const char CameraParameters::FOCUS_MODE_INFINITY[] = "infinity"; const char CameraParameters::FOCUS_MODE_MACRO[] = "macro"; const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed"; +const char CameraParameters::FOCUS_MODE_EDOF[] = "edof"; CameraParameters::CameraParameters() : mMap() 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; |