diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-05-05 15:56:08 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-05-05 15:56:08 +0200 |
| commit | 6915a0521897f42f3a37379af3cb513f6dcc57cb (patch) | |
| tree | f0d4a047aa3f1b15df3bfa32110e606dff363da9 | |
| parent | 77fa2ca1967351b02fe5c7e86cd46db0d109c050 (diff) | |
| download | frameworks_av-6915a0521897f42f3a37379af3cb513f6dcc57cb.zip frameworks_av-6915a0521897f42f3a37379af3cb513f6dcc57cb.tar.gz frameworks_av-6915a0521897f42f3a37379af3cb513f6dcc57cb.tar.bz2 | |
camera: fixup htc params
Change-Id: Iee0086e8a7319ada09f5191092c314c099e0d66a
| -rw-r--r-- | camera/CameraParameters.cpp | 15 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 5 |
2 files changed, 15 insertions, 5 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 2487257..5bdd961 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -198,7 +198,7 @@ const char CameraParameters::KEY_CAPTURE_MODE[] = "capture-mode"; const char CameraParameters::CAPTURE_MODE_NORMAL[] = "normal"; const char CameraParameters::CAPTURE_MODE_CONTI_ZOE[] = "contizoe"; const char CameraParameters::CAPTURE_MODE_CONTI_BURST[] = "contiburst"; -const char CameraParameters::CAPTURE_MODE_CONTI_BURST_ONE_SHOT[] = "fixme"; +const char CameraParameters::CAPTURE_MODE_CONTI_BURST_ONE_SHOT[] = "contiburst-one-shot"; const char CameraParameters::CAPTURE_MODE_HDR[] = "hdr"; const char CameraParameters::CAPTURE_MODE_PANORAMA[] = "panorama"; const char CameraParameters::CAPTURE_MODE_ZOE[] = "zoe"; @@ -213,14 +213,19 @@ const char CameraParameters::POST_PROCESSING_BYPASS[] = "bypass"; const char CameraParameters::POST_PROCESSING_DELAY[] = "delay"; const char CameraParameters::SCENE_MODE_OFF[] = "off"; const char CameraParameters::SCENE_MODE_TEXT[] = "text"; -const char CameraParameters::BURST_MODE_LIMIT20[] = "fixme"; -const char CameraParameters::BURST_MODE_UNLIMITED[] = "fixme"; +const char CameraParameters::BURST_MODE_LIMIT20[] = "limit-20"; +const char CameraParameters::BURST_MODE_UNLIMITED[] = "unlimited"; const char CameraParameters::OIS_MODE_OFF[] = "off"; const char CameraParameters::OIS_MODE_ON[] = "on"; -const char CameraParameters::CONTI_BURST_CAPTURING[] = "fixme"; -const char CameraParameters::CONTI_BURST_CAPTURE_DONE[] = "fixme"; +const char CameraParameters::CONTI_BURST_CAPTURING[] = "contiburst-capturing"; +const char CameraParameters::CONTI_BURST_CAPTURE_DONE[] = "contiburst-done"; const char CameraParameters::APP_OIS_SETTING_FALSE[] = "false"; const char CameraParameters::APP_OIS_SETTING_TRUE[] = "true"; +const char CameraParameters::KEY_GPU_EFFECT[] = "GPU-effect"; +const char CameraParameters::KEY_GPU_EFFECT_PARAM_0[] = "GE-param0"; +const char CameraParameters::KEY_GPU_EFFECT_PARAM_1[] = "GE-param1"; +const char CameraParameters::KEY_GPU_EFFECT_PARAM_2[] = "GE-param2"; +const char CameraParameters::KEY_GPU_EFFECT_PARAM_3[] = "GE-param3"; #endif const char CameraParameters::TRUE[] = "true"; diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 3a0734b..32b99da 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -687,6 +687,11 @@ public: static const char CONTI_BURST_CAPTURE_DONE[]; static const char APP_OIS_SETTING_FALSE[]; static const char APP_OIS_SETTING_TRUE[]; + static const char KEY_GPU_EFFECT[]; + static const char KEY_GPU_EFFECT_PARAM_0[]; + static const char KEY_GPU_EFFECT_PARAM_1[]; + static const char KEY_GPU_EFFECT_PARAM_2[]; + static const char KEY_GPU_EFFECT_PARAM_3[]; #endif static const char KEY_AE_BRACKET_HDR[]; |