summaryrefslogtreecommitdiffstats
path: root/camera/CameraHal.cpp
diff options
context:
space:
mode:
authorKyle Repinski <repinski23@gmail.com>2015-01-07 17:12:43 -0600
committerZiyan <jaraidaniel@gmail.com>2015-04-11 20:24:52 +0200
commit0ebe625decc5a52c5534bedc5ed31da332f42f80 (patch)
treefcc961a8fb7015cc1f606b9d9c7c062931e457cc /camera/CameraHal.cpp
parentc9ee5c0371fb6ca892f80f1725100ad03c8a2a2c (diff)
downloaddevice_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/CameraHal.cpp')
-rw-r--r--camera/CameraHal.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index 71ba1bb..a345e64 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -1108,6 +1108,7 @@ int CameraHal::setParameters(const android::CameraParameters& params)
mParameters.set(TICameraParameters::RAW_HEIGHT, valstr);
}
+#ifndef OMAP_TUNA
//TI extensions for enable/disable algos
if( (valstr = params.get(TICameraParameters::KEY_ALGO_FIXED_GAMMA)) != NULL )
{
@@ -1144,6 +1145,7 @@ int CameraHal::setParameters(const android::CameraParameters& params)
CAMHAL_LOGDB("Green Inballance Correction set %s", valstr);
mParameters.set(TICameraParameters::KEY_ALGO_GIC, valstr);
}
+#endif
android::CameraParameters adapterParams = mParameters;
@@ -4287,16 +4289,16 @@ void CameraHal::resetPreviewRes(android::CameraParameters *params)
void *
camera_buffer_get_omx_ptr (CameraBuffer *buffer)
{
- CAMHAL_LOGV("buffer_type %d opaque %p", buffer->type, buffer->opaque);
+ CAMHAL_LOGSV("buffer_type %d opaque %p", buffer->type, buffer->opaque);
if (buffer->type == CAMERA_BUFFER_ANW) {
buffer_handle_t *handle = (buffer_handle_t *)buffer->opaque;
- CAMHAL_LOGV("anw %08x", *handle);
+ CAMHAL_LOGSV("anw %08x", *handle);
return (void *)*handle;
} else if (buffer->type == CAMERA_BUFFER_ION) {
return (void *)buffer->fd;
} else {
- CAMHAL_LOGV("other %08x", buffer->opaque);
+ CAMHAL_LOGSV("other %08x", buffer->opaque);
return (void *)buffer->opaque;
}
}