summaryrefslogtreecommitdiffstats
path: root/camera/inc/CameraHal.h
diff options
context:
space:
mode:
authorAndriy Chepurnyy <x0155536@ti.com>2013-01-10 14:18:14 +0200
committerHashcode <hashcode0f@gmail.com>2015-02-03 13:38:43 -0800
commit8736cdb17c995e83399ba0604d52f007439afcee (patch)
treea965abf7fcf7ebbeeb623a4c3f535ed7f2a6a4de /camera/inc/CameraHal.h
parent36abd1f5030c36d32b7d139e0989b04c7c02fa9c (diff)
downloadhardware_ti_omap4-8736cdb17c995e83399ba0604d52f007439afcee.tar.gz
hardware_ti_omap4-8736cdb17c995e83399ba0604d52f007439afcee.tar.bz2
hardware_ti_omap4-8736cdb17c995e83399ba0604d52f007439afcee.zip
CameraHal: Correctly set preview framerate
Since Camera API supports 2 mechanisms that used to set FPS : setPreviewFpsRange and setPreviewFrameRate HAL should correctly handle situation when only one of that call were made. CameraHAL should not modify fps range or fps that was set by client, but it should inform camera adpter somehow what exactly was modified and what value should be used for configuration of preview port. So therefore new paramter KEY_PREVIEW_FRAME_RATE_RANGE was added. Now it will be used by camera adapters for preview configuration and camera hal will be capable for value of this parameter. Possible situations: 1) User had changed FPS range and HAL will use it for fps port value (don't care about changed or not const FPS). 2) User had changed single FPS and had not changed FPS range - will be applyed single FPS value to port. 3) Both FPS range and const FPS are unchanged - FPS range will be applied to port. This patch also fixed several CTS tests from android.media.cts.MediaRecorderTest : testRecorderCamera, testRecorderVideo, testSetMaxFileSize. Change-Id: I31badcdc62a1a33474cb8e0e893f50378e9f6114 Signed-off-by: Andriy Chepurnyy <x0155536@ti.com>
Diffstat (limited to 'camera/inc/CameraHal.h')
-rw-r--r--camera/inc/CameraHal.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h
index ef11baa..72f0f37 100644
--- a/camera/inc/CameraHal.h
+++ b/camera/inc/CameraHal.h
@@ -1311,6 +1311,7 @@ public:
unsigned int offset, unsigned int stride,
const char* format);
static unsigned int getBPP(const char* format);
+ static bool parsePair(const char *str, int *first, int *second, char delim);
/*--------------------Internal Member functions - Private---------------------------------*/
private: