summaryrefslogtreecommitdiffstats
path: root/camera/inc
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/inc
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/inc')
-rw-r--r--camera/inc/CameraHal.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h
index d20db1e..f1b013e 100644
--- a/camera/inc/CameraHal.h
+++ b/camera/inc/CameraHal.h
@@ -63,8 +63,13 @@
#define MIN_WIDTH 640
#define MIN_HEIGHT 480
+#ifdef OMAP_TUNA
+#define PICTURE_WIDTH 2592 /* 5mp - 2560. 8mp - 3280 */ /* Make sure it is a multiple of 16. */
+#define PICTURE_HEIGHT 1944 /* 5mp - 2048. 8mp - 2464 */ /* Make sure it is a multiple of 16. */
+#else
#define PICTURE_WIDTH 3264 /* 5mp - 2560. 8mp - 3280 */ /* Make sure it is a multiple of 16. */
#define PICTURE_HEIGHT 2448 /* 5mp - 2048. 8mp - 2464 */ /* Make sure it is a multiple of 16. */
+#endif
#define PREVIEW_WIDTH 176
#define PREVIEW_HEIGHT 144
#define PIXEL_FORMAT V4L2_PIX_FMT_UYVY