diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2015-01-07 17:12:43 -0600 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-04-11 20:24:52 +0200 |
| commit | 0ebe625decc5a52c5534bedc5ed31da332f42f80 (patch) | |
| tree | fcc961a8fb7015cc1f606b9d9c7c062931e457cc /camera/inc | |
| parent | c9ee5c0371fb6ca892f80f1725100ad03c8a2a2c (diff) | |
| download | device_samsung_tuna-0ebe625decc5a52c5534bedc5ed31da332f42f80.zip device_samsung_tuna-0ebe625decc5a52c5534bedc5ed31da332f42f80.tar.gz device_samsung_tuna-0ebe625decc5a52c5534bedc5ed31da332f42f80.tar.bz2 | |
camera: Fix more tuna issues, spruce up debugging.
- Move very verbose logs under new CAMERAHAL_SUPERVERBOSE and co.
- Add back 'default focal length', as tuna just reports '.' when trying to auto-fetch it.
- Hardcode camera facing values in insertFacing (sensor ID 305 is rear, the other (306) is front).
- ifdef out more things that will cause tuna to... lose its gills.
- 'Fix' preview resolutions not being inserted.
- Enable a few built-in workarounds that were under the 'CAMERAHAL_TUNA' define.
At this point, a few intelligent camera apps can handle the camera 'OK'.
AF is very spotty.
Signed-off-by: Kyle Repinski <repinski23@gmail.com>
Diffstat (limited to 'camera/inc')
| -rw-r--r-- | camera/inc/Common.h | 12 | ||||
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/camera/inc/Common.h b/camera/inc/Common.h index b369e65..690fce7 100644 --- a/camera/inc/Common.h +++ b/camera/inc/Common.h @@ -29,6 +29,15 @@ # define CAMHAL_LOGD DBGUTILS_LOGD # define CAMHAL_LOGDA DBGUTILS_LOGDA # define CAMHAL_LOGDB DBGUTILS_LOGDB +# ifdef CAMERAHAL_SUPERVERBOSE +# define CAMHAL_LOGSV DBGUTILS_LOGV +# define CAMHAL_LOGSVA DBGUTILS_LOGVA +# define CAMHAL_LOGSVB DBGUTILS_LOGVB +# else +# define CAMHAL_LOGSV(...) +# define CAMHAL_LOGSVA(str) +# define CAMHAL_LOGSVB(str, ...) +# endif # ifdef CAMERAHAL_DEBUG_VERBOSE # define CAMHAL_LOGV DBGUTILS_LOGV # define CAMHAL_LOGVA DBGUTILS_LOGVA @@ -42,6 +51,9 @@ # define CAMHAL_LOGD(...) # define CAMHAL_LOGDA(str) # define CAMHAL_LOGDB(str, ...) +# define CAMHAL_LOGSV(...) +# define CAMHAL_LOGSVA(str) +# define CAMHAL_LOGSVB(str, ...) # define CAMHAL_LOGV(...) # define CAMHAL_LOGVA(str) # define CAMHAL_LOGVB(str, ...) diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index 3d9d788..83969d1 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -702,7 +702,9 @@ private: static status_t insertCaptureModes(CameraProperties::Properties*, OMX_TI_CAPTYPE&); static status_t insertVideoSizes(CameraProperties::Properties*, OMX_TI_CAPTYPE&); static status_t insertFacing(CameraProperties::Properties*, OMX_TI_CAPTYPE&); +#ifndef OMAP_TUNA static status_t insertFocalLength(CameraProperties::Properties*, OMX_TI_CAPTYPE&); +#endif static status_t insertAutoConvergenceModes(CameraProperties::Properties*, OMX_TI_CAPTYPE&); static status_t insertManualConvergenceRange(CameraProperties::Properties*, OMX_TI_CAPTYPE&); static status_t insertLayout(CameraProperties::Properties*, OMX_TI_CAPTYPE&); @@ -969,6 +971,10 @@ private: static const char DEFAULT_MAX_FD_SW_FACES[]; static const char * DEFAULT_AE_LOCK; static const char * DEFAULT_AWB_LOCK; +#ifdef OMAP_TUNA + static const char DEFAULT_FOCAL_LENGTH_PRIMARY[]; + static const char DEFAULT_FOCAL_LENGTH_SECONDARY[]; +#endif static const char DEFAULT_HOR_ANGLE[]; static const char DEFAULT_VER_ANGLE[]; static const char DEFAULT_VIDEO_SIZE[]; |