Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cefb01ab: Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken

Browse Source
This commit is contained in:
Wu-cheng Li
2010-06-04 03:39:44 -07:00
committed by Android Git Automerger
parent 030a15531c cefb01abbf
commit ab5e67c60d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/camera/CameraParameters.h
View File

@@ -253,6 +253,9 @@ public:
// Metering mode. This affects how camera determines exposure. // Metering mode. This affects how camera determines exposure.
// Example value: "spot" or METERING_MODE_XXX constants. Read/write. // Example value: "spot" or METERING_MODE_XXX constants. Read/write.
static const char KEY_METERING_MODE[]; static const char KEY_METERING_MODE[];
// Supported metering modes.
// Example value: "center-weighted,frame-average,spot". Read only.
static const char KEY_SUPPORTED_METERING_MODES[];
// Value for KEY_ZOOM_SUPPORTED or KEY_SMOOTH_ZOOM_SUPPORTED. // Value for KEY_ZOOM_SUPPORTED or KEY_SMOOTH_ZOOM_SUPPORTED.
static const char TRUE[]; static const char TRUE[];

7
libs/camera/CameraParameters.cpp
View File

@@ -72,6 +72,7 @@ const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supporte
const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances"; const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances";
const char CameraParameters::KEY_VIDEO_FRAME_FORMAT[] = "video-frame-format"; const char CameraParameters::KEY_VIDEO_FRAME_FORMAT[] = "video-frame-format";
const char CameraParameters::KEY_METERING_MODE[] = "metering-mode"; const char CameraParameters::KEY_METERING_MODE[] = "metering-mode";
const char CameraParameters::KEY_SUPPORTED_METERING_MODES[] = "metering-mode-values";
const char CameraParameters::TRUE[] = "true"; const char CameraParameters::TRUE[] = "true";
const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity"; const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity";
@@ -144,9 +145,9 @@ const char CameraParameters::FOCUS_MODE_EDOF[] = "edof";
const char CameraParameters::FOCUS_MODE_CONTINUOUS[] = "continuous"; const char CameraParameters::FOCUS_MODE_CONTINUOUS[] = "continuous";
// Values for metering mode settings. // Values for metering mode settings.
const char METERING_MODE_CENTER_WEIGHTED[] = "center-weighted"; const char CameraParameters::METERING_MODE_CENTER_WEIGHTED[] = "center-weighted";
const char METERING_MODE_FRAME_AVERAGE[] = "frame-average"; const char CameraParameters::METERING_MODE_FRAME_AVERAGE[] = "frame-average";
const char METERING_MODE_SPOT[] = "spot"; const char CameraParameters::METERING_MODE_SPOT[] = "spot";
CameraParameters::CameraParameters() CameraParameters::CameraParameters()
: mMap() : mMap()