summaryrefslogtreecommitdiffstats
path: root/camera/inc/OMXCameraAdapter
diff options
context:
space:
mode:
authorTyler Luu <tluu@ti.com>2011-08-26 02:49:26 -0500
committerIliyan Malchev <malchev@google.com>2011-08-26 13:10:25 -0700
commit99909671a105cf19e234697d286a47475cf1bc55 (patch)
tree61c074fbd861386909a7e0ecfed3b0ce4a456d26 /camera/inc/OMXCameraAdapter
parent03eaaaeac69580b821e98e8850244b195bee5ba6 (diff)
downloadhardware_ti_omap4-99909671a105cf19e234697d286a47475cf1bc55.zip
hardware_ti_omap4-99909671a105cf19e234697d286a47475cf1bc55.tar.gz
hardware_ti_omap4-99909671a105cf19e234697d286a47475cf1bc55.tar.bz2
CameraHal: Use LUT to populate VFR list
Instead of trying to calculate supported VFR list from the min and max reported from Ducati, use a prepopulated LUT. It is difficult to programmatically add odd variable framerates, i.e (24,30). Change-Id: I149ee68dddd57f0f0f69ded6ad51739eec79c771 Signed-off-by: Tyler Luu <tluu@ti.com>
Diffstat (limited to 'camera/inc/OMXCameraAdapter')
-rw-r--r--camera/inc/OMXCameraAdapter/OMXCameraAdapter.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
index 6fc4423..d0e1e3d 100644
--- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
+++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
@@ -164,6 +164,10 @@ struct CapU32 {
const char *param;
};
+struct CapU32Pair {
+ OMX_U32 num1, num2;
+ const char *param;
+};
struct CapS32 {
OMX_S32 num;
const char *param;
@@ -522,7 +526,7 @@ private:
static status_t encodeISOCap(OMX_U32, const CapISO*, size_t, char*, size_t);
static size_t encodeZoomCap(OMX_S32, const CapZoom*, size_t, char*, size_t);
static status_t encodeFramerateCap(OMX_U32, OMX_U32, const CapFramerate*, size_t, char*, size_t);
- static status_t encodeVFramerateCap(OMX_TI_CAPTYPE&, char*, char*, size_t);
+ static status_t encodeVFramerateCap(OMX_TI_CAPTYPE&, const CapU32Pair*, size_t, char*, char*, size_t);
static status_t encodePixelformatCap(OMX_COLOR_FORMATTYPE,
const CapPixelformat*,
size_t,
@@ -660,6 +664,7 @@ private:
static const CapZoom mZoomStages [];
static const CapEVComp mEVCompRanges [];
static const CapISO mISOStages [];
+ static const CapU32Pair mVarFramerates [];
// OMX Camera defaults
static const char DEFAULT_ANTIBANDING[];