summaryrefslogtreecommitdiffstats
path: root/camera/CameraParameters.cpp
diff options
context:
space:
mode:
authorPavel Nedev <pnedev@mm-sol.com>2012-02-24 18:16:23 +0200
committerDaniel Levin <dendy@ti.com>2012-07-25 08:55:42 -0500
commitd0605c7ae9a44415204cb7506a23a48264ffb9ed (patch)
treeb32c5cd7255cbae2a5e99454e54e77a704911118 /camera/CameraParameters.cpp
parentfd797018180a61b82ead3347b55eca6591f6b6da (diff)
downloadhardware_ti_omap4-d0605c7ae9a44415204cb7506a23a48264ffb9ed.tar.gz
hardware_ti_omap4-d0605c7ae9a44415204cb7506a23a48264ffb9ed.tar.bz2
hardware_ti_omap4-d0605c7ae9a44415204cb7506a23a48264ffb9ed.zip
CameraHAL: VFR ranges fixes
Supported VFR ranges gotten from Ducati and supported fixed FPS filled to be within those ranges. Several unnecessary parameter keys removed. FPS handling in CameraHAL fixed. Added class FpsRange with sort() method that conforms Android requirement about FPS ranges order: - The list is sorted from small to large (first by maximum fps and then minimum fps). Merged fixed FPS values into FPS ranges. Made the last (maximum) of fixed and variable FPS ranges to be default. Signed-off-by: Pavel Nedev <pnedev@mm-sol.com> Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I634065fada4e3adc5a6bd7b2986a9b9caac661dc
Diffstat (limited to 'camera/CameraParameters.cpp')
-rw-r--r--camera/CameraParameters.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 21d4f9a..bb8ad13 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -113,8 +113,6 @@ const char CameraProperties::FOCAL_LENGTH[] = "prop-focal-length";
const char CameraProperties::HOR_ANGLE[] = "prop-horizontal-angle";
const char CameraProperties::VER_ANGLE[] = "prop-vertical-angle";
const char CameraProperties::FRAMERATE_RANGE[] = "prop-framerate-range-default";
-const char CameraProperties::FRAMERATE_RANGE_IMAGE[] = "prop-framerate-range-image-default";
-const char CameraProperties::FRAMERATE_RANGE_VIDEO[]="prop-framerate-range-video-default";
const char CameraProperties::FRAMERATE_RANGE_SUPPORTED[]="prop-framerate-range-values";
const char CameraProperties::SENSOR_ORIENTATION[]= "sensor-orientation";
const char CameraProperties::SENSOR_ORIENTATION_VALUES[]= "sensor-orientation-values";