diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-06-03 22:32:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-03 22:32:05 -0700 |
| commit | cd3514492c2d49aeb88eedae40b54dcdd3fcbd9a (patch) | |
| tree | 5dc7c57a5891532307f85a263e39479c9c182ef8 /camera/CameraParameters.cpp | |
| parent | c1640f49abb1efc31a5fb985cfde73913cebbe8b (diff) | |
| parent | 2b8aba228e6ebd45fe29714baa477f3ea2320095 (diff) | |
| download | frameworks_av-cd3514492c2d49aeb88eedae40b54dcdd3fcbd9a.zip frameworks_av-cd3514492c2d49aeb88eedae40b54dcdd3fcbd9a.tar.gz frameworks_av-cd3514492c2d49aeb88eedae40b54dcdd3fcbd9a.tar.bz2 | |
Merge "Add camera metering mode API." into kraken
Diffstat (limited to 'camera/CameraParameters.cpp')
| -rw-r--r-- | camera/CameraParameters.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index e4d5bb3..c11d18f 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -71,6 +71,7 @@ const char CameraParameters::KEY_ZOOM_SUPPORTED[] = "zoom-supported"; const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supported"; const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances"; const char CameraParameters::KEY_VIDEO_FRAME_FORMAT[] = "video-frame-format"; +const char CameraParameters::KEY_METERING_MODE[] = "metering-mode"; const char CameraParameters::TRUE[] = "true"; const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity"; @@ -142,6 +143,11 @@ const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed"; const char CameraParameters::FOCUS_MODE_EDOF[] = "edof"; const char CameraParameters::FOCUS_MODE_CONTINUOUS[] = "continuous"; +// Values for metering mode settings. +const char METERING_MODE_CENTER_WEIGHTED[] = "center-weighted"; +const char METERING_MODE_FRAME_AVERAGE[] = "frame-average"; +const char METERING_MODE_SPOT[] = "spot"; + CameraParameters::CameraParameters() : mMap() { |