summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorTyler Luu <tluu@ti.com>2011-10-29 02:16:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-29 02:16:12 +0000
commit0f2338c555446e851e6290882db06a5418257a96 (patch)
tree013a5a051d1c87cc4bd1cd7020150be42bb2a167 /camera
parent8589cb4ece130aac3f0ff36507118643f0d8d7a5 (diff)
parent39ad5f81c0a0cb884fafdf66a24a9473c72b2c25 (diff)
downloadhardware_ti_omap4xxx-0f2338c555446e851e6290882db06a5418257a96.zip
hardware_ti_omap4xxx-0f2338c555446e851e6290882db06a5418257a96.tar.gz
hardware_ti_omap4xxx-0f2338c555446e851e6290882db06a5418257a96.tar.bz2
am 39ad5f81: CameraHal: Limit 1080p framerate max
* commit '39ad5f81c0a0cb884fafdf66a24a9473c72b2c25': CameraHal: Limit 1080p framerate max
Diffstat (limited to 'camera')
-rwxr-xr-xcamera/OMXCameraAdapter/OMXCameraAdapter.cpp6
-rw-r--r--camera/OMXCameraAdapter/OMXCapabilities.cpp3
2 files changed, 9 insertions, 0 deletions
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 &params)
}
}
+ // 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