summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorGilles-Arnaud Bleu-Laine <gilles@ti.com>2011-11-05 19:33:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-05 19:33:19 +0000
commit47f01dc6bcf33d654eb2055ded683367ebae6be4 (patch)
tree615d9eef7e2e6ce07ce26227d038f569d58cb043 /camera
parent9536d8e44f5833bb1cf7f9fa0334de4e843841d7 (diff)
parentca7c3ac80e9b9311c59f0d2348fc51eae573bf4f (diff)
downloadhardware_ti_omap4-47f01dc6bcf33d654eb2055ded683367ebae6be4.zip
hardware_ti_omap4-47f01dc6bcf33d654eb2055ded683367ebae6be4.tar.gz
hardware_ti_omap4-47f01dc6bcf33d654eb2055ded683367ebae6be4.tar.bz2
am dfffc837: am d9949c1e: CameraHal: Add 2592x1728 and 2592x1458 image capture resolutions
* commit 'dfffc83746802d0c582772976103403ec5c58059': CameraHal: Add 2592x1728 and 2592x1458 image capture resolutions
Diffstat (limited to 'camera')
-rw-r--r--camera/OMXCameraAdapter/OMXCapabilities.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXCapabilities.cpp b/camera/OMXCameraAdapter/OMXCapabilities.cpp
index 9a6db24..e1323ee 100644
--- a/camera/OMXCameraAdapter/OMXCapabilities.cpp
+++ b/camera/OMXCameraAdapter/OMXCapabilities.cpp
@@ -57,6 +57,8 @@ const CapResolution OMXCameraAdapter::mImageCapRes [] = {
{ 3648, 2736, "3648x2736" },
{ 3264, 2448, "3264x2448" },
{ 2592, 1944, "2592x1944" },
+ { 2592, 1728, "2592x1728" },
+ { 2592, 1458, "2592x1458" },
{ 2048, 1536, "2048x1536" },
{ 1600, 1200, "1600x1200" },
{ 1280, 1024, "1280x1024" },