diff options
| author | Mike J. Chen <mjchen@sta.samsung.com> | 2010-10-18 11:27:17 -0700 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-10-20 13:32:52 +0800 |
| commit | fd7e5ebb97ca747659e02759e7cc83ac6feeb26f (patch) | |
| tree | 265cb7602ee6619f1141410ce015038dfa646340 /libcamera | |
| parent | 61a4cf7d6df1a684a6f4c64ed04de6212216c5b9 (diff) | |
| download | device_samsung_crespo-fd7e5ebb97ca747659e02759e7cc83ac6feeb26f.zip device_samsung_crespo-fd7e5ebb97ca747659e02759e7cc83ac6feeb26f.tar.gz device_samsung_crespo-fd7e5ebb97ca747659e02759e7cc83ac6feeb26f.tar.bz2 | |
S5PC11X: libcamera: Fix CTS issue and update focus distance
Initialize the mSecCamera settings in initDefaultParameters in case
setParameter() isn't called by the application (it's not required).
Also had to bump the delay in SecCamera::DeinitCamera() or else
the next CTS test was not able to start because SecCamera::initCamera
would fail to open /dev/video0 because it hadn't been completely
released by the previous camera test.
Also updated focus distances for back camera with new info from TechWin.
Change-Id: Ib84890a466e5f96908a333423e4dcf146a744252
Signed-off-by: Mike J. Chen <mjchen@sta.samsung.com>
Diffstat (limited to 'libcamera')
| -rw-r--r-- | libcamera/SecCamera.cpp | 2 | ||||
| -rw-r--r-- | libcamera/SecCameraHWInterface.cpp | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp index 282698e..93450b1 100644 --- a/libcamera/SecCamera.cpp +++ b/libcamera/SecCamera.cpp @@ -875,7 +875,7 @@ void SecCamera::DeinitCamera() } m_flag_init = 0; - usleep(100000); //100 ms delay to allow proper closure of fimc device. + usleep(500000); //500 ms delay to allow proper closure of fimc device. } } diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index 040a92f..12fc524 100644 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -48,10 +48,10 @@ #define HIBYTE(x) (((x) >> 8) & 0xFF) #define LOBYTE(x) ((x) & 0xFF) +#define BACK_CAMERA_AUTO_FOCUS_DISTANCES_STR "0.10,1.20,Infinity" +#define BACK_CAMERA_MACRO_FOCUS_DISTANCES_STR "0.10,0.20,Infinity" +#define BACK_CAMERA_INFINITY_FOCUS_DISTANCES_STR "0.10,1.20,Infinity" /* TBD: placeholder values, to be adjusted */ -#define BACK_CAMERA_AUTO_FOCUS_DISTANCES_STR "0.50,1.9,Infinity" -#define BACK_CAMERA_MACRO_FOCUS_DISTANCES_STR "0.10,0.30,Infinity" -#define BACK_CAMERA_INFINITY_FOCUS_DISTANCES_STR "0.50,0.50,Infinity" #define FRONT_CAMERA_FOCUS_DISTANCES_STR "0.30,0.30,Infinity" namespace android { @@ -363,6 +363,12 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) mParameters = p; mInternalParameters = ip; + + /* make sure mSecCamera has all the settings we do. applications + * aren't required to call setParameters themselves (only if they + * want to change something. + */ + setParameters(p); } CameraHardwareSec::~CameraHardwareSec() |