From 797f2045d2e972e5dc08cf0eff63a0415730aba4 Mon Sep 17 00:00:00 2001 From: Sundar Raman Date: Wed, 14 Sep 2011 21:05:42 -0700 Subject: CameraHAL: Fixes for FPS range configuration Change-Id: Idfc506812d6e0f1d88bdc5d7d62c159f9c9ad642 Signed-off-by: Sundar Raman --- camera/inc/CameraHal.h | 5 ++++- camera/inc/CameraProperties.h | 3 ++- camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'camera/inc') diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h index ca42a17..873fb59 100644 --- a/camera/inc/CameraHal.h +++ b/camera/inc/CameraHal.h @@ -1142,7 +1142,10 @@ public: sp mPictureHeap; - int* mGrallocHandles; + int* mGrallocHandles; + bool mFpsRangeChangedByApp; + + diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h index 27824f3..7a2eb54 100644 --- a/camera/inc/CameraProperties.h +++ b/camera/inc/CameraProperties.h @@ -117,6 +117,8 @@ public: static const char VSTAB[]; static const char VSTAB_VALUES[]; static const char FRAMERATE_RANGE[]; + static const char FRAMERATE_RANGE_IMAGE[]; + static const char FRAMERATE_RANGE_VIDEO[]; static const char FRAMERATE_RANGE_SUPPORTED[]; static const char DEFAULT_VALUE[]; @@ -130,7 +132,6 @@ public: static const char MAX_NUM_FOCUS_AREAS[]; static const char VIDEO_SNAPSHOT_SUPPORTED[]; - static const char DEFAULT_VIDEO_FPS_RANGE[]; CameraProperties(); ~CameraProperties(); diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index 4c85be4..e33746e 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -687,7 +687,8 @@ private: static const char DEFAULT_FLASH_MODE[]; static const char DEFAULT_FOCUS_MODE_PREFERRED[]; static const char DEFAULT_FOCUS_MODE[]; - static const char DEFAULT_FRAMERATE_RANGE[]; + static const char DEFAULT_FRAMERATE_RANGE_IMAGE[]; + static const char DEFAULT_FRAMERATE_RANGE_VIDEO[]; static const char DEFAULT_IPP[]; static const char DEFAULT_GBCE[]; static const char DEFAULT_ISO_MODE[]; -- cgit v1.1