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/OMXCameraAdapter/OMXDefaults.cpp | |
| 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/OMXCameraAdapter/OMXDefaults.cpp')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXDefaults.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXDefaults.cpp b/camera/OMXCameraAdapter/OMXDefaults.cpp index 2928573..b05d5ad 100644 --- a/camera/OMXCameraAdapter/OMXDefaults.cpp +++ b/camera/OMXCameraAdapter/OMXDefaults.cpp @@ -47,7 +47,11 @@ const char OMXCameraAdapter::DEFAULT_THUMBNAIL_QUALITY[] = "60"; const char OMXCameraAdapter::DEFAULT_THUMBNAIL_SIZE[] = "160x120"; const char OMXCameraAdapter::DEFAULT_PICTURE_FORMAT[] = "jpeg"; const char OMXCameraAdapter::DEFAULT_S3D_PICTURE_LAYOUT[] = "tb-full"; +#ifdef OMAP_TUNA +const char OMXCameraAdapter::DEFAULT_PICTURE_SIZE[] = "2592x1944"; +#else const char OMXCameraAdapter::DEFAULT_PICTURE_SIZE[] = "320x240"; +#endif const char OMXCameraAdapter::DEFAULT_PICTURE_SS_SIZE[] = "640x240"; const char OMXCameraAdapter::DEFAULT_PICTURE_TB_SIZE[] = "320x480"; const char OMXCameraAdapter::DEFAULT_PREVIEW_FORMAT[] = "yuv420sp"; @@ -67,6 +71,10 @@ const char OMXCameraAdapter::DEFAULT_WB[] = "auto"; const char OMXCameraAdapter::DEFAULT_ZOOM[] = "0"; const char OMXCameraAdapter::DEFAULT_MAX_FD_HW_FACES[] = __STRINGIFY(MAX_NUM_FACES_SUPPORTED); const char OMXCameraAdapter::DEFAULT_MAX_FD_SW_FACES[] = "0"; +#ifdef OMAP_TUNA +const char OMXCameraAdapter::DEFAULT_FOCAL_LENGTH_PRIMARY[] = "3.43"; +const char OMXCameraAdapter::DEFAULT_FOCAL_LENGTH_SECONDARY[] = "1.95"; +#endif const char OMXCameraAdapter::DEFAULT_HOR_ANGLE[] = "54.8"; const char OMXCameraAdapter::DEFAULT_VER_ANGLE[] = "42.5"; const char * OMXCameraAdapter::DEFAULT_AE_LOCK = android::CameraParameters::FALSE; @@ -75,7 +83,11 @@ const char OMXCameraAdapter::DEFAULT_VIDEO_SIZE[] = "1920x1080"; const char OMXCameraAdapter::DEFAULT_SENSOR_ORIENTATION[] = "0"; const char OMXCameraAdapter::DEFAULT_AUTOCONVERGENCE_MODE[] = "frame"; const char OMXCameraAdapter::DEFAULT_MANUAL_CONVERGENCE[] = "0"; +#ifdef OMAP_TUNA +const char * OMXCameraAdapter::DEFAULT_MECHANICAL_MISALIGNMENT_CORRECTION_MODE = android::CameraParameters::FALSE; +#else const char * OMXCameraAdapter::DEFAULT_MECHANICAL_MISALIGNMENT_CORRECTION_MODE = android::CameraParameters::TRUE; +#endif const char OMXCameraAdapter::DEFAULT_EXIF_MAKE[] = "default_make"; const char OMXCameraAdapter::DEFAULT_EXIF_MODEL[] = "default_model"; |