diff options
author | Ethan Chen <intervigil@gmail.com> | 2012-05-18 23:00:51 -0700 |
---|---|---|
committer | Ethan Chen <intervigil@gmail.com> | 2012-05-21 01:05:55 -0700 |
commit | dc4a6eb75a44136c9e753d1569058a7cfc1e1704 (patch) | |
tree | f9c82fa7262c5ff16540ee81329abc18804cd813 | |
parent | 0a872611c6ebe9a8f67dfb294e18b06c8fffd52d (diff) | |
download | frameworks_base-dc4a6eb75a44136c9e753d1569058a7cfc1e1704.zip frameworks_base-dc4a6eb75a44136c9e753d1569058a7cfc1e1704.tar.gz frameworks_base-dc4a6eb75a44136c9e753d1569058a7cfc1e1704.tar.bz2 |
camera: Add parameters for HTC msm8960
Enable with QCOM_HARDWARE.
Add MIN_SATURATION, MIN_SHARPNESS, MIN_CONTRAST, CONTI_BURST modes.
Change-Id: Ia744e32620629967e1fc17fa4c3c08016bdaa370
-rw-r--r-- | include/camera/CameraParameters.h | 11 | ||||
-rw-r--r-- | libs/camera/CameraParameters.cpp | 17 |
2 files changed, 28 insertions, 0 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 5aa0648..7d92506 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -179,11 +179,13 @@ public: static const char KEY_PREVIEW_FRAME_RATE_AUTO_MODE[]; static const char KEY_PREVIEW_FRAME_RATE_FIXED_MODE[]; static const char KEY_CAPTURE_MODE[]; + static const char KEY_SUPPORTED_CAPTURE_MODES[]; static const char KEY_PICTURE_COUNT[]; static const char KEY_MAX_BURST_PICTURE_COUNT[]; static const char KEY_SUPPORTED_CONTINUOUS_AF[]; static const char CAPTURE_MODE_NORMAL[]; static const char CAPTURE_MODE_BURST[]; + static const char CAPTURE_MODE_CONTI_BURST[]; static const char CAPTURE_MODE_HDR[]; static const char CAPTURE_MODE_HJR[]; static const char CAPTURE_MODE_PANORAMA[]; @@ -845,10 +847,19 @@ public: static const char KEY_SHARPNESS[]; static const char KEY_MAX_SHARPNESS[]; +#ifdef QCOM_HARDWARE + static const char KEY_MIN_SHARPNESS[]; +#endif static const char KEY_CONTRAST[]; static const char KEY_MAX_CONTRAST[]; +#ifdef QCOM_HARDWARE + static const char KEY_MIN_CONTRAST[]; +#endif static const char KEY_SATURATION[]; static const char KEY_MAX_SATURATION[]; +#ifdef QCOM_HARDWARE + static const char KEY_MIN_SATURATION[]; +#endif static const char KEY_HISTOGRAM[] ; static const char KEY_SUPPORTED_HISTOGRAM_MODES[] ; diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp index 4f1f7d316..94c7481 100644 --- a/libs/camera/CameraParameters.cpp +++ b/libs/camera/CameraParameters.cpp @@ -46,6 +46,7 @@ const char CameraParameters::CAF_ON[] = "caf-on"; //Same, for CodeAurora-based blobs const char CameraParameters::CAPTURE_MODE_NORMAL[] = "normal"; const char CameraParameters::CAPTURE_MODE_BURST[] = "burst"; +const char CameraParameters::CAPTURE_MODE_CONTI_BURST[] = "contiburst"; const char CameraParameters::CAPTURE_MODE_HDR[] = "hdr"; const char CameraParameters::CAPTURE_MODE_HJR[] = "hjr"; const char CameraParameters::CAPTURE_MODE_PANORAMA[] = "panorama"; @@ -56,6 +57,7 @@ const char CameraParameters::KEY_CAPTURE_MODE[] = "capture-mode"; const char CameraParameters::KEY_PICTURE_COUNT[] = "picture-count"; const char CameraParameters::KEY_MAX_BURST_PICTURE_COUNT[] = "max-burst-picture-count"; const char CameraParameters::KEY_SUPPORTED_CONTINUOUS_AF[] = "continuous-af-mode"; +const char CameraParameters::KEY_SUPPORTED_CAPTURE_MODES[] = "capture-mode-values"; #endif const char CameraParameters::KEY_PICTURE_SIZE[] = "picture-size"; const char CameraParameters::KEY_SUPPORTED_PICTURE_SIZES[] = "picture-size-values"; @@ -309,11 +311,26 @@ const char CameraParameters::SKIN_TONE_ENHANCEMENT_ENABLE[] = "enable"; const char CameraParameters::SKIN_TONE_ENHANCEMENT_DISABLE[] = "disable"; const char CameraParameters::KEY_SHARPNESS[] = "sharpness"; +#ifdef QCOM_HARDWARE +const char CameraParameters::KEY_MAX_SHARPNESS[] = "sharpness-max"; +const char CameraParameters::KEY_MIN_SHARPNESS[] = "sharpness-min"; +#else const char CameraParameters::KEY_MAX_SHARPNESS[] = "max-sharpness"; +#endif const char CameraParameters::KEY_CONTRAST[] = "contrast"; +#ifdef QCOM_HARDWARE +const char CameraParameters::KEY_MAX_CONTRAST[] = "contrast-max"; +const char CameraParameters::KEY_MIN_CONTRAST[] = "contrast-min"; +#else const char CameraParameters::KEY_MAX_CONTRAST[] = "max-contrast"; +#endif const char CameraParameters::KEY_SATURATION[] = "saturation"; +#ifdef QCOM_HARDWARE +const char CameraParameters::KEY_MAX_SATURATION[] = "saturation-max"; +const char CameraParameters::KEY_MIN_SATURATION[] = "saturation-min"; +#else const char CameraParameters::KEY_MAX_SATURATION[] = "max-saturation"; +#endif //Values for DENOISE const char CameraParameters::DENOISE_OFF[] = "denoise-off"; |