diff options
| author | Arne Coucheron <arco68@gmail.com> | 2013-04-15 05:31:41 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-21 01:04:04 -0700 |
| commit | 0a73ca4805b0e4c6fed190c424959822b339a223 (patch) | |
| tree | 5bef3cc2848069498f16f97e9e4f920a4ac0145a | |
| parent | ff2064e7dcad3c85005fc4564e04fde184240df9 (diff) | |
| download | frameworks_av-0a73ca4805b0e4c6fed190c424959822b339a223.zip frameworks_av-0a73ca4805b0e4c6fed190c424959822b339a223.tar.gz frameworks_av-0a73ca4805b0e4c6fed190c424959822b339a223.tar.bz2 | |
Camera parameters for Samsung's qcom based legacy devices
Change-Id: I8f84e06771338d992521e69704d21cd113201b4b
| -rw-r--r-- | camera/CameraParameters.cpp | 30 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 22 |
2 files changed, 52 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index eedf8f4..b082c1b 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -127,7 +127,11 @@ const char CameraParameters::KEY_ISO_MODE[] = "iso"; const char CameraParameters::KEY_SUPPORTED_ISO_MODES[] = "iso-values"; const char CameraParameters::KEY_LENSSHADE[] = "lensshade"; const char CameraParameters::KEY_SUPPORTED_LENSSHADE_MODES[] = "lensshade-values"; +#ifdef SAMSUNG_CAMERA_LEGACY +const char CameraParameters::KEY_AUTO_EXPOSURE[] = "metering"; +#else const char CameraParameters::KEY_AUTO_EXPOSURE[] = "auto-exposure"; +#endif const char CameraParameters::KEY_SUPPORTED_AUTO_EXPOSURE[] = "auto-exposure-values"; const char CameraParameters::KEY_DENOISE[] = "denoise"; const char CameraParameters::KEY_SUPPORTED_DENOISE[] = "denoise-values"; @@ -244,7 +248,11 @@ const char CameraParameters::SCENE_MODE_SPORTS[] = "sports"; const char CameraParameters::SCENE_MODE_PARTY[] = "party"; const char CameraParameters::SCENE_MODE_CANDLELIGHT[] = "candlelight"; #ifdef QCOM_HARDWARE +#ifdef SAMSUNG_CAMERA_LEGACY +const char CameraParameters::SCENE_MODE_BACKLIGHT[] = "back-light"; +#else const char CameraParameters::SCENE_MODE_BACKLIGHT[] = "backlight"; +#endif const char CameraParameters::SCENE_MODE_FLOWERS[] = "flowers"; #endif const char CameraParameters::SCENE_MODE_BARCODE[] = "barcode"; @@ -397,6 +405,28 @@ const char CameraParameters::AE_BRACKET[] = "AE-Bracket"; const char CameraParameters::LOW_POWER[] = "Low_Power"; const char CameraParameters::NORMAL_POWER[] = "Normal_Power"; +#if defined(QCOM_HARDWARE) && defined(SAMSUNG_CAMERA_LEGACY) +const char CameraParameters::FOCUS_MODE_FACEDETECT[] = "facedetect"; +const char CameraParameters::FOCUS_MODE_TOUCHAF[] = "touchaf"; +const char CameraParameters::ISO_50[] = "ISO50"; +const char CameraParameters::KEY_ANTI_SHAKE_MODE[] = "antishake"; +const char CameraParameters::KEY_AUTO_CONTRAST[] = "auto-contrast"; +const char CameraParameters::KEY_BEAUTY_MODE[] = "beauty"; +const char CameraParameters::KEY_BLUR_MODE[] = "blur"; +const char CameraParameters::KEY_VINTAGE_MODE[] = "vintagemode"; +const char CameraParameters::KEY_WDR_MODE[] = "wdr"; +const char CameraParameters::VINTAGE_MODE_BNW[] = "bnw"; +const char CameraParameters::VINTAGE_MODE_COOL[] = "cool"; +const char CameraParameters::VINTAGE_MODE_NORMAL[] = "normal"; +const char CameraParameters::VINTAGE_MODE_OFF[] = "off"; +const char CameraParameters::VINTAGE_MODE_WARM[] = "warm"; +const char CameraParameters::SCENE_MODE_DAWN[] = "dusk-dawn"; +const char CameraParameters::SCENE_MODE_DUSKDAWN[] = "dusk-dawn"; +const char CameraParameters::SCENE_MODE_FALL[] = "fall-color"; +const char CameraParameters::SCENE_MODE_FALL_COLOR[] = "fall-color"; +const char CameraParameters::SCENE_MODE_TEXT[] = "text"; +#endif + static const char* portrait = "portrait"; static const char* landscape = "landscape"; diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index eb74d09..2ed5825 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -946,6 +946,28 @@ public: static const char HDR_ENABLE[]; static const char HDR_DISABLE[]; +#if defined(QCOM_HARDWARE) && defined(SAMSUNG_CAMERA_LEGACY) + static const char FOCUS_MODE_FACEDETECT[]; + static const char FOCUS_MODE_TOUCHAF[]; + static const char ISO_50[]; + static const char KEY_ANTI_SHAKE_MODE[]; + static const char KEY_AUTO_CONTRAST[]; + static const char KEY_BEAUTY_MODE[]; + static const char KEY_BLUR_MODE[]; + static const char KEY_VINTAGE_MODE[]; + static const char KEY_WDR_MODE[]; + static const char VINTAGE_MODE_BNW[]; + static const char VINTAGE_MODE_COOL[]; + static const char VINTAGE_MODE_NORMAL[]; + static const char VINTAGE_MODE_OFF[]; + static const char VINTAGE_MODE_WARM[]; + static const char SCENE_MODE_DAWN[]; + static const char SCENE_MODE_DUSKDAWN[]; + static const char SCENE_MODE_FALL[]; + static const char SCENE_MODE_FALL_COLOR[]; + static const char SCENE_MODE_TEXT[]; +#endif + // Values for Redeye Reduction settings. // static const char REDEYE_REDUCTION_ENABLE[]; // static const char REDEYE_REDUCTION_DISABLE[]; |