diff options
| author | Pavel Nedev <pnedev@mm-sol.com> | 2012-03-05 14:22:05 +0200 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-07-25 08:55:43 -0500 |
| commit | 8b7996e171a3ea296df1212c1a5f53e297ccfe7a (patch) | |
| tree | c1fd33d8cbc4f3486e78b9d748f59ea7fb58ec88 | |
| parent | 0b438f4383b73e8d84d7695972bd7d1287c8d15f (diff) | |
| download | hardware_ti_omap4-8b7996e171a3ea296df1212c1a5f53e297ccfe7a.zip hardware_ti_omap4-8b7996e171a3ea296df1212c1a5f53e297ccfe7a.tar.gz hardware_ti_omap4-8b7996e171a3ea296df1212c1a5f53e297ccfe7a.tar.bz2 | |
CameraHAL: Return error upon illegal FPS range
When the FPS range value is not supported exit setParameters() with error.
Change-Id: I0e760ecac477dfca514534d902b9e8fe1faaffc5
Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>
| -rw-r--r-- | camera/CameraHal.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp index 14cc03e..ba17822 100644 --- a/camera/CameraHal.cpp +++ b/camera/CameraHal.cpp @@ -509,7 +509,6 @@ int CameraHal::setParameters(const CameraParameters& params) // applied. // If Port FPS needs to be used for configuring, then FPS RANGE should not be set by the APP. valstr = params.get(CameraParameters::KEY_PREVIEW_FPS_RANGE); - framerate = 0; if (valstr != NULL && strlen(valstr)) { // APP wants to set FPS range // Set framerate = MAXFPS @@ -519,15 +518,15 @@ int CameraHal::setParameters(const CameraParameters& params) // Validate VFR if (!isFpsRangeValid(minFPS, maxFPS, params.get(CameraParameters::KEY_SUPPORTED_PREVIEW_FPS_RANGE))) { CAMHAL_LOGEA("Invalid FPS Range"); + return BAD_VALUE; } else { framerate = maxFPS / CameraHal::VFR_SCALE; mParameters.setPreviewFrameRate(framerate); CAMHAL_LOGDB("SET FRAMERATE %d", framerate); - CAMHAL_LOGDB("FPS Range = %s", valstr); mParameters.set(CameraParameters::KEY_PREVIEW_FPS_RANGE, valstr); + CAMHAL_LOGDB("FPS Range = %s", valstr); } - } - if (!framerate) { + } else { framerate = params.getPreviewFrameRate(); if (!isParameterValid(framerate, params.get(CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATES))) { CAMHAL_LOGEA("Invalid frame rate"); |