summaryrefslogtreecommitdiffstats
path: root/camera/CameraHal.cpp
diff options
context:
space:
mode:
authorKyle Repinski <repinski23@gmail.com>2015-01-07 23:40:29 -0600
committerZiyan <jaraidaniel@gmail.com>2015-04-11 20:24:53 +0200
commitfbc224e05ad87bed523eb548df2194da0696cc60 (patch)
treeaa9b46f3ea0f591279e423c8b5aeb8a354a3708e /camera/CameraHal.cpp
parent0ebe625decc5a52c5534bedc5ed31da332f42f80 (diff)
downloaddevice_samsung_tuna-fbc224e05ad87bed523eb548df2194da0696cc60.zip
device_samsung_tuna-fbc224e05ad87bed523eb548df2194da0696cc60.tar.gz
device_samsung_tuna-fbc224e05ad87bed523eb548df2194da0696cc60.tar.bz2
camera: Forcefully add jpeg picture format to supported formats.
Also a few minor bugfixes/workarounds. All camera apps I've tested (including AOSP and Google Camera) function well now. Few issues left to fix, but this has been very successful so far. Signed-off-by: Kyle Repinski <repinski23@gmail.com>
Diffstat (limited to 'camera/CameraHal.cpp')
-rw-r--r--camera/CameraHal.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index a345e64..2a1cf25 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -4157,12 +4157,21 @@ void CameraHal::initDefaultParameters()
// TI extensions for enable/disable algos
// Hadcoded for now
+#ifdef OMAP_TUNA
+ p.set(TICameraParameters::KEY_ALGO_FIXED_GAMMA, android::CameraParameters::FALSE);
+ p.set(TICameraParameters::KEY_ALGO_NSF1, android::CameraParameters::FALSE);
+ p.set(TICameraParameters::KEY_ALGO_NSF2, android::CameraParameters::FALSE);
+ p.set(TICameraParameters::KEY_ALGO_SHARPENING, android::CameraParameters::FALSE);
+ p.set(TICameraParameters::KEY_ALGO_THREELINCOLORMAP, android::CameraParameters::FALSE);
+ p.set(TICameraParameters::KEY_ALGO_GIC, android::CameraParameters::FALSE);
+#else
p.set(TICameraParameters::KEY_ALGO_FIXED_GAMMA, android::CameraParameters::TRUE);
p.set(TICameraParameters::KEY_ALGO_NSF1, android::CameraParameters::TRUE);
p.set(TICameraParameters::KEY_ALGO_NSF2, android::CameraParameters::TRUE);
p.set(TICameraParameters::KEY_ALGO_SHARPENING, android::CameraParameters::TRUE);
p.set(TICameraParameters::KEY_ALGO_THREELINCOLORMAP, android::CameraParameters::TRUE);
p.set(TICameraParameters::KEY_ALGO_GIC, android::CameraParameters::TRUE);
+#endif
LOG_FUNCTION_NAME_EXIT;
}