diff options
| author | Tyler Luu <tluu@ti.com> | 2011-10-31 12:26:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-31 12:26:25 +0000 |
| commit | e6d87d1ea3c5c0de9d517745b17518351fd3b34c (patch) | |
| tree | da1dee477a6c0bdf9d99ccb86e586f91b254d0fc | |
| parent | 42e9e19d7040f30311f5b242102d58065a7dcf59 (diff) | |
| parent | 0f2338c555446e851e6290882db06a5418257a96 (diff) | |
| download | hardware_ti_omap4xxx-e6d87d1ea3c5c0de9d517745b17518351fd3b34c.zip hardware_ti_omap4xxx-e6d87d1ea3c5c0de9d517745b17518351fd3b34c.tar.gz hardware_ti_omap4xxx-e6d87d1ea3c5c0de9d517745b17518351fd3b34c.tar.bz2 | |
am 0f2338c5: am 39ad5f81: CameraHal: Limit 1080p framerate max
* commit '0f2338c555446e851e6290882db06a5418257a96':
CameraHal: Limit 1080p framerate max
| -rwxr-xr-x | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 6 | ||||
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCapabilities.cpp | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index 1f5ab37..4495d50 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 |