diff options
author | tbalden <illespal@gmail.com> | 2013-03-23 23:06:45 +0100 |
---|---|---|
committer | tbalden <illespal@gmail.com> | 2013-04-14 11:01:38 +0200 |
commit | ff2064e7dcad3c85005fc4564e04fde184240df9 (patch) | |
tree | 52dd63087c9954b038196439420e91c843dcab8c /include | |
parent | 203e28ca88001f2a0f4db7a3018977c687333941 (diff) | |
download | frameworks_av-ff2064e7dcad3c85005fc4564e04fde184240df9.zip frameworks_av-ff2064e7dcad3c85005fc4564e04fde184240df9.tar.gz frameworks_av-ff2064e7dcad3c85005fc4564e04fde184240df9.tar.bz2 |
Camera: QCOM legacy definitions,HTC cam switch,NO_UPDATE_PREVIEW
Updating Camera parameters, and service with several
compatibility patches:
1., QCOM legacy CameraParameters and functions:
Adding these will make ICS qcomm camera blobs work on JB 4.2.
Use BOARD_USES_QCOM_LEGACY_CAM_PARAMS := true in BoardConfig
to use this.
Also fixes the problem of legacy qcom
camera blobs with recent libcameraservice QCOM_HARDWARE changes,
where the orientation is messed up on first
preview: the fix is leaving out setPreviewWindow(window) for
legacy qcomm cam blobs.
2., Also adding NO_UPDATE_PREVIEW flag for legacy purposes.
3., Adding adding the set orientation patch:
Always set buffers orientation when setting the qcom camera preview window
Fixes the rotated preview on TouchPad
https://github.com/CyanogenMod/android_frameworks_base/commit/1a8e41a3c7434737db89b604352575f8b3109e7a
4., camera: Full support for HTC camera switch
5., Adding more parameters for HTC Explorer
Change-Id: I2bfc72b8ef027665356788f1db7f96b31d037dbe
Diffstat (limited to 'include')
-rw-r--r-- | include/camera/CameraParameters.h | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 21e907e..eb74d09 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -182,6 +182,20 @@ public: 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 KEY_CAPTURE_MODE[]; + static const char KEY_SUPPORTED_CAPTURE_MODES[]; + 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 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[]; +#endif #endif // The dimensions for captured pictures in pixels (width x height). // Example value: "1024x768". Read/write. @@ -825,6 +839,22 @@ public: static const char FOCUS_MODE_CONTINUOUS_PICTURE[]; #ifdef QCOM_HARDWARE +#ifdef QCOM_LEGACY_CAM_PARAMS + static const char FOCUS_MODE_CONTINUOUS_CAMERA[]; + + // Values for Continuous AF + static const char CAF_OFF[] ; + static const char CAF_ON[] ; + // Proprietaries from CodeAurora use these... + static const char CONTINUOUS_AF_OFF[] ; + static const char CONTINUOUS_AF_ON[] ; + static const char KEY_CONTINUOUS_AF[] ; + static const char KEY_CAF[] ; + 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 // Normal focus mode. Applications should call // CameraHardwareInterface.autoFocus to start the focus in this mode. static const char FOCUS_MODE_NORMAL[]; @@ -848,10 +878,19 @@ public: 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[] ; @@ -922,6 +961,9 @@ public: 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<Size> &sizes) const; #endif |