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 | 5f5df382e5b87f02399f21c916e0ebb6c48c759d (patch) | |
| tree | 17291c68df4f7836674bf9a0f53753261795a83f /libs/camera | |
| parent | 266b74e8759e76fedec60ec1ffa88cfbd86cc91d (diff) | |
| parent | f7f6333831e7b991d92abeddfbd46c2884afa405 (diff) | |
| download | frameworks_base-5f5df382e5b87f02399f21c916e0ebb6c48c759d.zip frameworks_base-5f5df382e5b87f02399f21c916e0ebb6c48c759d.tar.gz frameworks_base-5f5df382e5b87f02399f21c916e0ebb6c48c759d.tar.bz2 | |
Merge "Add camera metering mode API." into kraken
Diffstat (limited to 'libs/camera')
| -rw-r--r-- | libs/camera/CameraParameters.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp index e4d5bb3..c11d18f 100644 --- a/libs/camera/CameraParameters.cpp +++ b/libs/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() { |