summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-03-29 17:21:28 +0800
committerWu-cheng Li <wuchengli@google.com>2010-04-10 09:33:15 +0800
commit465d5a7f3517f11aaa819c8ae982e113ad5ec479 (patch)
tree40598c743c92f51f67bef9381bd0ffaa23e47fbe /camera
parent32f8c1cf4ab2abdd902535fc44a6549ba6f0ff33 (diff)
downloadframeworks_av-465d5a7f3517f11aaa819c8ae982e113ad5ec479.zip
frameworks_av-465d5a7f3517f11aaa819c8ae982e113ad5ec479.tar.gz
frameworks_av-465d5a7f3517f11aaa819c8ae982e113ad5ec479.tar.bz2
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
bug:2544367 Change-Id: If122a7745e080f9e4bffb15dc4930d71f0421867
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraParameters.cpp2
1 files changed, 2 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()