diff options
| author | Javier Ferrer <javi.f.o@gmail.com> | 2013-07-11 16:56:54 +0200 |
|---|---|---|
| committer | Javier Ferrer <javi.f.o@gmail.com> | 2013-07-19 09:37:05 +0200 |
| commit | abf3ce339d9ec6c162d742c71da372ab77fb966e (patch) | |
| tree | a6981c1a3978e38d09946c111676e1e413a9b7b1 | |
| parent | 1f48f3c5f721c0afa48f0015896822fd3f725af2 (diff) | |
| download | frameworks_av-abf3ce339d9ec6c162d742c71da372ab77fb966e.zip frameworks_av-abf3ce339d9ec6c162d742c71da372ab77fb966e.tar.gz frameworks_av-abf3ce339d9ec6c162d742c71da372ab77fb966e.tar.bz2 | |
Add some Samsung camera color effects
Change-Id: I6bf0c7fa0b9b86ed56d8f974fe49564c02e6b47d
| -rw-r--r-- | camera/CameraParameters.cpp | 9 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 8e495e1..6320357 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -256,6 +256,15 @@ const char CameraParameters::EFFECT_POSTERIZE[] = "posterize"; const char CameraParameters::EFFECT_WHITEBOARD[] = "whiteboard"; const char CameraParameters::EFFECT_BLACKBOARD[] = "blackboard"; const char CameraParameters::EFFECT_AQUA[] = "aqua"; +#ifdef SAMSUNG_CAMERA_HARDWARE +const char CameraParameters::EFFECT_CARTOONIZE[] = "cartoonize"; +const char CameraParameters::EFFECT_POINT_RED_YELLOW[] = "point-red-yellow"; +const char CameraParameters::EFFECT_POINT_GREEN[] = "point-green"; +const char CameraParameters::EFFECT_POINT_BLUE[] = "point-blue"; +const char CameraParameters::EFFECT_VINTAGE_COLD[] = "vintage-cold"; +const char CameraParameters::EFFECT_VINTAGE_WARM[] = "vintage-warm"; +const char CameraParameters::EFFECT_WASHED[] = "washed"; +#endif #ifdef QCOM_HARDWARE const char CameraParameters::EFFECT_EMBOSS[] = "emboss"; const char CameraParameters::EFFECT_SKETCH[] = "sketch"; diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 5fa4e49..696d5d2 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -745,6 +745,15 @@ public: static const char EFFECT_WHITEBOARD[]; static const char EFFECT_BLACKBOARD[]; static const char EFFECT_AQUA[]; +#ifdef SAMSUNG_CAMERA_HARDWARE + static const char EFFECT_CARTOONIZE[]; + static const char EFFECT_POINT_RED_YELLOW[]; + static const char EFFECT_POINT_GREEN[]; + static const char EFFECT_POINT_BLUE[]; + static const char EFFECT_VINTAGE_COLD[]; + static const char EFFECT_VINTAGE_WARM[]; + static const char EFFECT_WASHED[]; +#endif #ifdef QCOM_HARDWARE static const char EFFECT_EMBOSS[]; static const char EFFECT_SKETCH[]; |