From 77fa2ca1967351b02fe5c7e86cd46db0d109c050 Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Sat, 4 May 2013 19:48:15 +0200 Subject: [WIP]: camera: add parameters for htc cameras Change-Id: I1456e5af22d1cb68fd19626a136fef68c5573074 --- camera/CameraParameters.cpp | 35 +++++++++++++++++++++++++++++++++++ include/camera/CameraParameters.h | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index d86e0f3..2487257 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -188,6 +188,41 @@ const char CameraParameters::KEY_WEATHER[] = "weather"; const char CameraParameters::KEY_CITYID[] = "contextualtag-cityid"; #endif +#ifdef HTC_CAMERA_HARDWARE +const char CameraParameters::KEY_TIME_CONS_POST_PROCESSING[] = "time-cons-post-processing"; +const char CameraParameters::KEY_OIS_MODE[] = "ois_mode"; +const char CameraParameters::KEY_APP_OIS_SETTING[] = "ois-setting"; +const char CameraParameters::KEY_OIS_SUPPORT[] = "ois_support"; +const char CameraParameters::KEY_CONTIBURST_TYPE[] = "contiburst-type"; +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_HDR[] = "hdr"; +const char CameraParameters::CAPTURE_MODE_PANORAMA[] = "panorama"; +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_MIN_SHARPNESS[] = "sharpness-min"; +const char CameraParameters::KEY_MIN_SATURATION[] = "saturation-min"; +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"; +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::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::APP_OIS_SETTING_FALSE[] = "false"; +const char CameraParameters::APP_OIS_SETTING_TRUE[] = "true"; +#endif + const char CameraParameters::TRUE[] = "true"; const char CameraParameters::FALSE[] = "false"; const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity"; diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 61cf359..3a0734b 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -653,6 +653,42 @@ public: static const char KEY_WEATHER[]; static const char KEY_CITYID[]; #endif + +#ifdef HTC_CAMERA_HARDWARE + static const char KEY_TIME_CONS_POST_PROCESSING[]; + static const char KEY_OIS_MODE[]; + static const char KEY_APP_OIS_SETTING[]; + static const char KEY_OIS_SUPPORT[]; + static const char KEY_CONTIBURST_TYPE[]; + static const char KEY_CAPTURE_MODE[]; + static const char CAPTURE_MODE_NORMAL[]; + static const char CAPTURE_MODE_CONTI_ZOE[]; + static const char CAPTURE_MODE_CONTI_BURST[]; + static const char CAPTURE_MODE_CONTI_BURST_ONE_SHOT[]; + static const char CAPTURE_MODE_HDR[]; + static const char CAPTURE_MODE_PANORAMA[]; + static const char CAPTURE_MODE_ZOE[]; + static const char KEY_CONTI_BURST_STATE[]; + static const char KEY_SUPPORTED_CAPTURE_MODES[]; + static const char KEY_MIN_CONTRAST[]; + static const char KEY_MIN_SHARPNESS[]; + static const char KEY_MIN_SATURATION[]; + static const char KEY_SINGLE_ISP_OUTPUT_ENABLED[]; + static const char POST_PROCESSING_ENABLE[]; + static const char POST_PROCESSING_BYPASS[]; + static const char POST_PROCESSING_DELAY[]; + static const char SCENE_MODE_OFF[]; + static const char SCENE_MODE_TEXT[]; + static const char BURST_MODE_LIMIT20[]; + static const char BURST_MODE_UNLIMITED[]; + static const char OIS_MODE_OFF[]; + static const char OIS_MODE_ON[]; + static const char CONTI_BURST_CAPTURING[]; + static const char CONTI_BURST_CAPTURE_DONE[]; + static const char APP_OIS_SETTING_FALSE[]; + static const char APP_OIS_SETTING_TRUE[]; +#endif + static const char KEY_AE_BRACKET_HDR[]; // Value for KEY_ZOOM_SUPPORTED or KEY_SMOOTH_ZOOM_SUPPORTED. -- cgit v1.1