diff options
| author | Mike J. Chen <mjchen@sta.samsung.com> | 2010-10-21 10:54:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 10:54:06 -0700 |
| commit | 507fc586d034bd0a466f54b821a3412aa4616316 (patch) | |
| tree | aeebc8f5130962a320728c63a4baf2daf26581c6 /libcamera | |
| parent | 71e43ab417e84e5aea65f4c708af026b399faa4a (diff) | |
| parent | fd7e5ebb97ca747659e02759e7cc83ac6feeb26f (diff) | |
| download | device_samsung_crespo-507fc586d034bd0a466f54b821a3412aa4616316.zip device_samsung_crespo-507fc586d034bd0a466f54b821a3412aa4616316.tar.gz device_samsung_crespo-507fc586d034bd0a466f54b821a3412aa4616316.tar.bz2 | |
am fd7e5ebb: S5PC11X: libcamera: Fix CTS issue and update focus distance
Merge commit 'fd7e5ebb97ca747659e02759e7cc83ac6feeb26f'
* commit 'fd7e5ebb97ca747659e02759e7cc83ac6feeb26f':
S5PC11X: libcamera: Fix CTS issue and update focus distance
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 1f1f83a..4f114bc 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() |