From 39ad5f81c0a0cb884fafdf66a24a9473c72b2c25 Mon Sep 17 00:00:00 2001 From: Tyler Luu Date: Fri, 28 Oct 2011 14:50:45 -0500 Subject: CameraHal: Limit 1080p framerate max Change-Id: Ic02b60940f80d309f9a87b6e1307fbbdd0c592ff Signed-off-by: Tyler Luu related-to-bug: 5508276 --- camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 6 ++++++ camera/OMXCameraAdapter/OMXCapabilities.cpp | 3 +++ 2 files changed, 9 insertions(+) (limited to 'camera') diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index 6dab841..f7bd45f 100755 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -490,6 +490,12 @@ status_t OMXCameraAdapter::setParameters(const CameraParameters ¶ms) } } + // TODO(XXX): Limiting 1080p to (24,24) or (15,15) for now. Need to remove later. + if ((w >= 1920) && (h >= 1080)) { + cap->mMaxFrameRate = cap->mMinFrameRate; + setVFramerate(cap->mMinFrameRate, cap->mMaxFrameRate); + } + if ( 0 < frameRate ) { cap->mColorFormat = pixFormat; diff --git a/camera/OMXCameraAdapter/OMXCapabilities.cpp b/camera/OMXCameraAdapter/OMXCapabilities.cpp index db7a46b..9a6db24 100644 --- a/camera/OMXCameraAdapter/OMXCapabilities.cpp +++ b/camera/OMXCameraAdapter/OMXCapabilities.cpp @@ -196,7 +196,10 @@ const CapU32Pair OMXCameraAdapter::mVarFramerates [] = { { 15, 15, "(15000,15000)"}, { 30, 15, "(15000,30000)" }, { 30, 24, "(24000,30000)" }, +// TODO(XXX): Removing 30,30 range to limit 1080p at 24fps. Will put back soon. +#if 0 { 30, 30, "(30000,30000)" }, +#endif }; /************************************ * static helper functions -- cgit v1.1