From dd11cdaf2ccb4e1a21b6b381848a82c2a0449af6 Mon Sep 17 00:00:00 2001 From: Konsta Date: Wed, 2 Apr 2014 20:45:44 +0300 Subject: [PATCH] bring back qcom legacy camera parameters Set COMMON_GLOBAL_CFLAGS += -DQCOM_LEGACY_CAM_PARAMS in BoardConfig.mk to enable. --- camera/CameraParameters.cpp | 47 +++++++++++++++++++++++++++++++ include/camera/CameraParameters.h | 37 ++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 649b85c6123..96c80177f8b 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -40,6 +40,31 @@ const char CameraParameters::KEY_PREVIEW_FRAME_RATE_MODE[] = "preview-frame-rate const char CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATE_MODES[] = "preview-frame-rate-modes"; const char CameraParameters::KEY_PREVIEW_FRAME_RATE_AUTO_MODE[] = "frame-rate-auto"; const char CameraParameters::KEY_PREVIEW_FRAME_RATE_FIXED_MODE[] = "frame-rate-fixed"; +#ifdef QCOM_LEGACY_CAM_PARAMS +const char CameraParameters::CAF_OFF[] = "caf-off"; +const char CameraParameters::CAF_ON[] = "caf-on"; +const char CameraParameters::CAPTURE_MODE_NORMAL[] = "normal"; +const char CameraParameters::CAPTURE_MODE_BURST[] = "burst"; +const char CameraParameters::CAPTURE_MODE_CONTI_BURST[] = "contiburst"; +const char CameraParameters::CAPTURE_MODE_HDR[] = "hdr"; +const char CameraParameters::CAPTURE_MODE_HJR[] = "hjr"; +const char CameraParameters::CAPTURE_MODE_PANORAMA[] = "panorama"; +const char CameraParameters::CONTINUOUS_AF_OFF[] = "caf-off"; +const char CameraParameters::CONTINUOUS_AF_ON[] = "caf-on"; +const char CameraParameters::FOCUS_MODE_CONTINUOUS_CAMERA[] = "continuous-camera"; +const char CameraParameters::KEY_CONTINUOUS_AF[] = "continuous-af"; +const char CameraParameters::KEY_CAF[] = "continuous-af"; +const char CameraParameters::KEY_CAPTURE_MODE[] = "capture-mode"; +const char CameraParameters::KEY_PICTURE_COUNT[] = "picture-count"; +const char CameraParameters::KEY_MAX_BURST_PICTURE_COUNT[] = "max-burst-picture-count"; +const char CameraParameters::KEY_SUPPORTED_CONTINUOUS_AF[] = "continuous-af-mode"; +const char CameraParameters::KEY_SUPPORTED_CAF[] = "continuous-af-values"; +const char CameraParameters::KEY_SUPPORTED_CAPTURE_MODES[] = "capture-mode-values"; +const char CameraParameters::KEY_TAKING_PICTURE_ZOOM[] = "taking-picture-zoom"; +const char CameraParameters::KEY_PANORAMA_MODE[] = "panorama-mode"; +const char CameraParameters::PANORAMA_MODE_NOT_INPROGRESS[] = "not-in-progress"; +const char CameraParameters::PANORAMA_MODE_INPROGRESS[] = "in-progress"; +#endif #endif const char CameraParameters::KEY_PICTURE_SIZE[] = "picture-size"; const char CameraParameters::KEY_SUPPORTED_PICTURE_SIZES[] = "picture-size-values"; @@ -428,11 +453,26 @@ const char CameraParameters::SKIN_TONE_ENHANCEMENT_ENABLE[] = "enable"; const char CameraParameters::SKIN_TONE_ENHANCEMENT_DISABLE[] = "disable"; const char CameraParameters::KEY_SHARPNESS[] = "sharpness"; +#ifdef QCOM_LEGACY_CAM_PARAMS +const char CameraParameters::KEY_MAX_SHARPNESS[] = "sharpness-max"; +const char CameraParameters::KEY_MIN_SHARPNESS[] = "sharpness-min"; +#else const char CameraParameters::KEY_MAX_SHARPNESS[] = "max-sharpness"; +#endif const char CameraParameters::KEY_CONTRAST[] = "contrast"; +#ifdef QCOM_LEGACY_CAM_PARAMS +const char CameraParameters::KEY_MAX_CONTRAST[] = "contrast-max"; +const char CameraParameters::KEY_MIN_CONTRAST[] = "contrast-min"; +#else const char CameraParameters::KEY_MAX_CONTRAST[] = "max-contrast"; +#endif const char CameraParameters::KEY_SATURATION[] = "saturation"; +#ifdef QCOM_LEGACY_CAM_PARAMS +const char CameraParameters::KEY_MAX_SATURATION[] = "saturation-max"; +const char CameraParameters::KEY_MIN_SATURATION[] = "saturation-min"; +#else const char CameraParameters::KEY_MAX_SATURATION[] = "max-saturation"; +#endif //Values for DENOISE const char CameraParameters::DENOISE_OFF[] = "denoise-off"; @@ -761,6 +801,13 @@ void CameraParameters::getSupportedPreviewSizes(Vector &sizes) const } #ifdef QCOM_HARDWARE +#ifdef QCOM_LEGACY_CAM_PARAMS +void CameraParameters::setPostviewSize(int width, int height) +{ + // dummy +} +#endif + void CameraParameters::getSupportedHfrSizes(Vector &sizes) const { const char *hfrSizesStr = get(KEY_SUPPORTED_HFR_SIZES); diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 0454f2134a1..6796117082a 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -182,6 +182,31 @@ class CameraParameters static const char KEY_SUPPORTED_PREVIEW_FRAME_RATE_MODES[]; static const char KEY_PREVIEW_FRAME_RATE_AUTO_MODE[]; static const char KEY_PREVIEW_FRAME_RATE_FIXED_MODE[]; +#ifdef QCOM_LEGACY_CAM_PARAMS + static const char CAF_OFF[]; + static const char CAF_ON[]; + static const char CAPTURE_MODE_NORMAL[]; + static const char CAPTURE_MODE_BURST[]; + static const char CAPTURE_MODE_CONTI_BURST[]; + static const char CAPTURE_MODE_HDR[]; + static const char CAPTURE_MODE_HJR[]; + static const char CAPTURE_MODE_PANORAMA[]; + static const char CONTINUOUS_AF_OFF[]; + static const char CONTINUOUS_AF_ON[]; + static const char FOCUS_MODE_CONTINUOUS_CAMERA[]; + static const char KEY_CONTINUOUS_AF[]; + static const char KEY_CAF[]; + static const char KEY_CAPTURE_MODE[]; + static const char KEY_PICTURE_COUNT[]; + static const char KEY_MAX_BURST_PICTURE_COUNT[]; + static const char KEY_SUPPORTED_CONTINUOUS_AF[]; + static const char KEY_SUPPORTED_CAF[]; + static const char KEY_SUPPORTED_CAPTURE_MODES[]; + static const char KEY_TAKING_PICTURE_ZOOM[]; + static const char KEY_PANORAMA_MODE[]; + static const char PANORAMA_MODE_NOT_INPROGRESS[]; + static const char PANORAMA_MODE_INPROGRESS[]; +#endif #endif // The dimensions for captured pictures in pixels (width x height). // Example value: "1024x768". Read/write. @@ -970,10 +995,19 @@ class CameraParameters static const char KEY_SHARPNESS[]; static const char KEY_MAX_SHARPNESS[]; +#ifdef QCOM_LEGACY_CAM_PARAMS + static const char KEY_MIN_SHARPNESS[]; +#endif static const char KEY_CONTRAST[]; static const char KEY_MAX_CONTRAST[]; +#ifdef QCOM_LEGACY_CAM_PARAMS + static const char KEY_MIN_CONTRAST[]; +#endif static const char KEY_SATURATION[]; static const char KEY_MAX_SATURATION[]; +#ifdef QCOM_LEGACY_CAM_PARAMS + static const char KEY_MIN_SATURATION[]; +#endif static const char KEY_HISTOGRAM[] ; static const char KEY_SUPPORTED_HISTOGRAM_MODES[] ; @@ -1066,6 +1100,9 @@ class CameraParameters int getOrientation() const; void setOrientation(int orientation); void setPreviewFpsRange(int minFPS,int maxFPS); +#ifdef QCOM_LEGACY_CAM_PARAMS + void setPostviewSize(int x, int y); +#endif void getSupportedHfrSizes(Vector &sizes) const; #endif