diff options
author | Saravanan Solaiyappan <saravanan.s@ti.com> | 2012-02-15 18:22:51 -0600 |
---|---|---|
committer | Daniel Levin <dendy@ti.com> | 2012-07-25 08:55:43 -0500 |
commit | 5d2300c6ca28086860bb4c667c44887e2b528648 (patch) | |
tree | 82e0e97d5b79ce058e50a2d0f100b3118803d1b3 /camera/CameraHal.cpp | |
parent | d1331730a10d1343dac39940277b17321a1db7f8 (diff) | |
download | hardware_ti_omap4-5d2300c6ca28086860bb4c667c44887e2b528648.zip hardware_ti_omap4-5d2300c6ca28086860bb4c667c44887e2b528648.tar.gz hardware_ti_omap4-5d2300c6ca28086860bb4c667c44887e2b528648.tar.bz2 |
CameraHAL: V4LCameraAdapter: Enables USB camera basic preview.
[Comment]
This pach enables the usb camera preview via V4L camera adapter in ICS.
The following change needs to be done in camera/Android.mk file to build
the V4L camera adapter.
OMAP4_CAMERA_HAL_USES:= USB
[DR]
-
Change-Id: I314649e0bbe52978a28296e1f9da20f176171d7d
Signed-off-by: Solaiyappan Saravanan <saravanan.s@ti.com>
Diffstat (limited to 'camera/CameraHal.cpp')
-rw-r--r-- | camera/CameraHal.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp index 774762f..31b3c32 100644 --- a/camera/CameraHal.cpp +++ b/camera/CameraHal.cpp @@ -262,6 +262,11 @@ int CameraHal::setParameters(const CameraParameters& params) bool updateRequired = false; CameraParameters oldParams(mParameters.flatten()); +#ifdef V4L_CAMERA_ADAPTER + ret = mCameraAdapter->setParameters(params); + return ret; +#endif + { Mutex::Autolock lock(mLock); |