diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2012-11-27 01:30:33 +0100 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2012-11-27 01:32:09 +0100 |
| commit | dcab2607c1a4afb2355c1c1a3a137dffc99927c0 (patch) | |
| tree | 1118f1ce7e0551315961165f8a285ddb096d7214 | |
| parent | 2eec3d39eed9f116a4dded5e39eff2a6f04a337d (diff) | |
| download | frameworks_av-dcab2607c1a4afb2355c1c1a3a137dffc99927c0.zip frameworks_av-dcab2607c1a4afb2355c1c1a3a137dffc99927c0.tar.gz frameworks_av-dcab2607c1a4afb2355c1c1a3a137dffc99927c0.tar.bz2 | |
camera: add iso parameter
Enable with BOARD_CAMERA_HAVE_ISO
From: jt1134 <jt1134@gmail.com>
Date: Mon, 17 Sep 2012 22:05:04 -0500
Subject: [PATCH] camera: add define for ISO settings
Change-Id: I8716a260ad552d3684197237c2055dce129e461e
---
| -rw-r--r-- | camera/Android.mk | 4 | ||||
| -rw-r--r-- | camera/CameraParameters.cpp | 5 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 7286f92..cad2a53 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -18,6 +18,10 @@ LOCAL_SHARED_LIBRARIES := \ libui \ libgui +ifeq ($(BOARD_CAMERA_HAVE_ISO),true) + LOCAL_CFLAGS += -DHAVE_ISO +endif + LOCAL_MODULE:= libcamera_client include $(BUILD_SHARED_LIBRARY) diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 90250ea..45b5196 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -91,6 +91,11 @@ const char CameraParameters::KEY_VIDEO_SNAPSHOT_SUPPORTED[] = "video-snapshot-su const char CameraParameters::KEY_VIDEO_STABILIZATION[] = "video-stabilization"; const char CameraParameters::KEY_VIDEO_STABILIZATION_SUPPORTED[] = "video-stabilization-supported"; +#ifdef HAVE_ISO +const char CameraParameters::KEY_SUPPORTED_ISO_MODES[] = "iso-values"; +const char CameraParameters::KEY_ISO_MODE[] = "iso"; +#endif + #ifdef SAMSUNG_CAMERA_HARDWARE const char CameraParameters::KEY_ANTI_SHAKE_MODE[] = "anti-shake"; const char CameraParameters::KEY_METERING[] = "metering"; diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index e877f04..c4c2f09 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -525,6 +525,11 @@ public: // stream and record stabilized videos. static const char KEY_VIDEO_STABILIZATION_SUPPORTED[]; +#ifdef HAVE_ISO + static const char KEY_SUPPORTED_ISO_MODES[]; + static const char KEY_ISO_MODE[]; +#endif + #ifdef SAMSUNG_CAMERA_HARDWARE static const char KEY_ANTI_SHAKE_MODE[]; static const char KEY_METERING[]; |