summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorKonsta <konsta09@gmail.com>2014-08-15 21:04:15 +0300
committerKonsta <konsta09@gmail.com>2014-11-11 10:12:46 +0200
commit8b850c19f85c0c0512acee4b2899f7daf4c7aca5 (patch)
tree3bb640df63a1e6db75dfb18ef733c4d3e700b54e /camera
parent8bc546ec494ba5df3e3aabaaa01747d16054f713 (diff)
downloadframeworks_av-8b850c19f85c0c0512acee4b2899f7daf4c7aca5.tar.gz
frameworks_av-8b850c19f85c0c0512acee4b2899f7daf4c7aca5.tar.bz2
frameworks_av-8b850c19f85c0c0512acee4b2899f7daf4c7aca5.zip
camera: allow device to append camera parameters
Overload using include/camera/CameraParametersExtra.h in device tree to add device specific camera parameters. Change-Id: Ie79380f4e49661348df4b2028ddf48daa67fca2d
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraParameters.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 196817302b..de26ae7932 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <camera/CameraParameters.h>
+#include <camera/CameraParametersExtra.h>
#include <system/graphics.h>
namespace android {
@@ -175,6 +176,10 @@ const char CameraParameters::FOCUS_MODE_MANUAL_POSITION[] = "manual";
const char CameraParameters::LIGHTFX_LOWLIGHT[] = "low-light";
const char CameraParameters::LIGHTFX_HDR[] = "high-dynamic-range";
+#ifdef CAMERA_PARAMETERS_EXTRA_C
+CAMERA_PARAMETERS_EXTRA_C
+#endif
+
CameraParameters::CameraParameters()
: mMap()
{