summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-01-27 22:55:14 +0800
committerWu-cheng Li <wuchengli@google.com>2010-01-30 20:36:04 +0800
commit077c40fee35f483df961c6a0746ee78b9d1c5a8f (patch)
treee191acfba8c0c74b6b06e1c07855fcc0f13880c1
parentb0b1eff2bc61008194627190da2b7535677e533a (diff)
downloadframeworks_native-077c40fee35f483df961c6a0746ee78b9d1c5a8f.zip
frameworks_native-077c40fee35f483df961c6a0746ee78b9d1c5a8f.tar.gz
frameworks_native-077c40fee35f483df961c6a0746ee78b9d1c5a8f.tar.bz2
Add focal length and view angle API.
bug:2375989,2375987
-rw-r--r--include/ui/CameraParameters.h10
-rw-r--r--libs/ui/CameraParameters.cpp3
2 files changed, 13 insertions, 0 deletions
diff --git a/include/ui/CameraParameters.h b/include/ui/CameraParameters.h
index cae0676..b9c2bbe 100644
--- a/include/ui/CameraParameters.h
+++ b/include/ui/CameraParameters.h
@@ -176,6 +176,16 @@ public:
// Supported focus modes.
// Example value: "auto,macro,fixed". Read only.
static const char KEY_SUPPORTED_FOCUS_MODES[];
+ // Focal length in millimeter.
+ // Example value: "4.31". Read only.
+ static const char KEY_FOCAL_LENGTH[];
+ // Horizontal angle of view in degrees.
+ // Example value: "54.8". Read only.
+ static const char KEY_HORIZONTAL_VIEW_ANGLE[];
+ // Vertical angle of view in degrees.
+ // Example value: "42.5". Read only.
+ static const char KEY_VERTICAL_VIEW_ANGLE[];
+
// Values for white balance settings.
static const char WHITE_BALANCE_AUTO[];
diff --git a/libs/ui/CameraParameters.cpp b/libs/ui/CameraParameters.cpp
index a94f6b9..495e164 100644
--- a/libs/ui/CameraParameters.cpp
+++ b/libs/ui/CameraParameters.cpp
@@ -56,6 +56,9 @@ const char CameraParameters::KEY_FLASH_MODE[] = "flash-mode";
const char CameraParameters::KEY_SUPPORTED_FLASH_MODES[] = "flash-mode-values";
const char CameraParameters::KEY_FOCUS_MODE[] = "focus-mode";
const char CameraParameters::KEY_SUPPORTED_FOCUS_MODES[] = "focus-mode-values";
+const char CameraParameters::KEY_FOCAL_LENGTH[] = "focal-length";
+const char CameraParameters::KEY_HORIZONTAL_VIEW_ANGLE[] = "horizontal-view-angle";
+const char CameraParameters::KEY_VERTICAL_VIEW_ANGLE[] = "vertical-view-angle";
// Values for white balance settings.
const char CameraParameters::WHITE_BALANCE_AUTO[] = "auto";