diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-07-04 11:14:11 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-04 11:14:11 -0700 |
| commit | 1f48f3c5f721c0afa48f0015896822fd3f725af2 (patch) | |
| tree | 0c34564f529446838b310d5cd3c96d754309c888 | |
| parent | f02808339bb06f3fd243973db18d53089338fd94 (diff) | |
| parent | ffa1b64ed5618a471c974cdd6c398927c1dfe39b (diff) | |
| download | frameworks_av-1f48f3c5f721c0afa48f0015896822fd3f725af2.zip frameworks_av-1f48f3c5f721c0afa48f0015896822fd3f725af2.tar.gz frameworks_av-1f48f3c5f721c0afa48f0015896822fd3f725af2.tar.bz2 | |
Merge "Camera: Add more htc parameters" into cm-10.1
| -rw-r--r-- | camera/CameraParameters.cpp | 3 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 3ce04bd..8e495e1 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -205,8 +205,11 @@ const char CameraParameters::CAPTURE_MODE_ZOE[] = "zoe"; const char CameraParameters::KEY_CONTI_BURST_STATE[] = "contiburst-state"; const char CameraParameters::KEY_SUPPORTED_CAPTURE_MODES[] = "capture-mode-values"; const char CameraParameters::KEY_MIN_CONTRAST[] = "contrast-min"; +const char CameraParameters::KEY_DEF_CONTRAST[] = "contrast-def"; const char CameraParameters::KEY_MIN_SHARPNESS[] = "sharpness-min"; +const char CameraParameters::KEY_DEF_SHARPNESS[] = "sharpness-def"; const char CameraParameters::KEY_MIN_SATURATION[] = "saturation-min"; +const char CameraParameters::KEY_DEF_SATURATION[] = "saturation-def"; const char CameraParameters::KEY_SINGLE_ISP_OUTPUT_ENABLED[] = "single-isp-output-enabled"; const char CameraParameters::POST_PROCESSING_ENABLE[] = "enable"; const char CameraParameters::POST_PROCESSING_BYPASS[] = "bypass"; diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 71e8f8b..5fa4e49 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -671,8 +671,11 @@ public: static const char KEY_CONTI_BURST_STATE[]; static const char KEY_SUPPORTED_CAPTURE_MODES[]; static const char KEY_MIN_CONTRAST[]; + static const char KEY_DEF_CONTRAST[]; static const char KEY_MIN_SHARPNESS[]; + static const char KEY_DEF_SHARPNESS[]; static const char KEY_MIN_SATURATION[]; + static const char KEY_DEF_SATURATION[]; static const char KEY_SINGLE_ISP_OUTPUT_ENABLED[]; static const char POST_PROCESSING_ENABLE[]; static const char POST_PROCESSING_BYPASS[]; |