diff options
| author | athurh <athurh@gmail.com> | 2012-07-07 22:10:22 +0200 |
|---|---|---|
| committer | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-07-08 08:33:51 +0200 |
| commit | 77df29016cdca1b73b5f9ec1b47db9833232133c (patch) | |
| tree | fac2e55863605ed114785582f84e48e97ae433a9 | |
| parent | 38220edd314d82c269132a735c89ac22c3472893 (diff) | |
| download | frameworks_base-77df29016cdca1b73b5f9ec1b47db9833232133c.zip frameworks_base-77df29016cdca1b73b5f9ec1b47db9833232133c.tar.gz frameworks_base-77df29016cdca1b73b5f9ec1b47db9833232133c.tar.bz2 | |
camera: ISO mode support (1/2)
Change-Id: Icdd4f676ea15b933985a9505fcf316aeb7c50ce2
| -rw-r--r-- | core/java/android/hardware/Camera.java | 8 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 8 | ||||
| -rw-r--r-- | libs/camera/CameraParameters.cpp | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 86725ac..0b1dc44 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1656,7 +1656,7 @@ public class Camera { private static final String KEY_SCENE_DETECT = "scene-detect"; private static final String KEY_FLASH_MODE = "flash-mode"; private static final String KEY_FOCUS_MODE = "focus-mode"; - private static final String KEY_ISO_MODE = "iso"; + private static final String KEY_ISO_MODE = "iso"; private static final String KEY_LENSSHADE = "lensshade"; private static final String KEY_HISTOGRAM = "histogram"; private static final String KEY_SKIN_TONE_ENHANCEMENT = "skinToneEnhancement"; @@ -1703,7 +1703,7 @@ public class Camera { private static final String KEY_SELECTABLE_ZONE_AF = "selectable-zone-af"; private static final String KEY_FACE_DETECTION = "face-detection"; private static final String KEY_MEMORY_COLOR_ENHANCEMENT = "mce"; - private static final String KEY_REDEYE_REDUCTION = "redeye-reduction"; + private static final String KEY_REDEYE_REDUCTION = "redeye-reduction"; private static final String KEY_ZSL = "zsl"; private static final String KEY_CAMERA_MODE = "camera-mode"; private static final String KEY_VIDEO_HIGH_FRAME_RATE = "video-hfr"; @@ -1753,8 +1753,8 @@ public class Camera { public static final String ANTIBANDING_50HZ = "50hz"; public static final String ANTIBANDING_60HZ = "60hz"; public static final String ANTIBANDING_OFF = "off"; - //Values for ISO settings + //Values for ISO settings /** @hide */ public static final String ISO_AUTO = "auto"; /** @hide */ @@ -3787,7 +3787,7 @@ public class Camera { * @hide * Gets the supported ISO values. * - * @return a List of FLASH_MODE_XXX string constants. null if flash mode + * @return a list of ISO_XXX string constants. null if ISO * setting is not supported. */ public List<String> getSupportedIsoValues() { diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 7d92506..a5340b3 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -656,9 +656,11 @@ public: #endif #ifdef SAMSUNG_CAMERA_HARDWARE - static const char KEY_METERING[]; - static const char KEY_WDR[]; - static const char KEY_ANTI_SHAKE_MODE[]; + static const char KEY_METERING[]; + static const char KEY_WDR[]; + static const char KEY_ANTI_SHAKE_MODE[]; + static const char KEY_ISO_MODE[]; + static const char KEY_SUPPORTED_ISO_MODES[]; #endif // Values for white balance settings. diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp index 94c7481..a6f2b3e 100644 --- a/libs/camera/CameraParameters.cpp +++ b/libs/camera/CameraParameters.cpp @@ -144,6 +144,8 @@ const char CameraParameters::KEY_SUPPORTED_HDR_IMAGING_MODES[] = "hdr-values"; const char CameraParameters::KEY_METERING[] = "metering"; const char CameraParameters::KEY_WDR[] = "wdr"; const char CameraParameters::KEY_ANTI_SHAKE_MODE[] = "anti-shake"; +const char CameraParameters::KEY_ISO_MODE[] = "iso"; +const char CameraParameters::KEY_SUPPORTED_ISO_MODES[] = "iso-values"; #endif const char CameraParameters::KEY_VIDEO_SIZE[] = "video-size"; const char CameraParameters::KEY_SUPPORTED_VIDEO_SIZES[] = "video-size-values"; |