diff options
| author | Sundar Raman <sunds@ti.com> | 2011-09-14 21:05:42 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-09-19 22:29:04 -0700 |
| commit | 797f2045d2e972e5dc08cf0eff63a0415730aba4 (patch) | |
| tree | f2b4806ccc63fd5f094f49669f8fa8a6c83d8dd8 /camera/inc | |
| parent | ec04f2cba99eb1e58886650f336605385ba502b0 (diff) | |
| download | hardware_ti_omap4-797f2045d2e972e5dc08cf0eff63a0415730aba4.zip hardware_ti_omap4-797f2045d2e972e5dc08cf0eff63a0415730aba4.tar.gz hardware_ti_omap4-797f2045d2e972e5dc08cf0eff63a0415730aba4.tar.bz2 | |
CameraHAL: Fixes for FPS range configuration
Change-Id: Idfc506812d6e0f1d88bdc5d7d62c159f9c9ad642
Signed-off-by: Sundar Raman <sunds@ti.com>
Diffstat (limited to 'camera/inc')
| -rw-r--r-- | camera/inc/CameraHal.h | 5 | ||||
| -rw-r--r-- | camera/inc/CameraProperties.h | 3 | ||||
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 3 |
3 files changed, 8 insertions, 3 deletions
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<IMemoryHeap> 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[]; |