diff options
| author | Jeong-Seok Yang <jseok.yang@samsung.com> | 2010-10-26 22:06:41 -0700 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-10-28 12:05:03 +0900 |
| commit | 3e5e64b503111e0d6df4cda9342fceb6ef5fe0ce (patch) | |
| tree | eab1a4d073ba51823a84258a4e94912f6f0059fa /libcamera | |
| parent | efbd4cb5c555608cb0abd292ca228768211d7226 (diff) | |
| download | device_samsung_crespo-3e5e64b503111e0d6df4cda9342fceb6ef5fe0ce.zip device_samsung_crespo-3e5e64b503111e0d6df4cda9342fceb6ef5fe0ce.tar.gz device_samsung_crespo-3e5e64b503111e0d6df4cda9342fceb6ef5fe0ce.tar.bz2 | |
libcamera: Adjust some parameters
fps for VGA: 7-15
focal length for VGA: 0.9 mm
Change-Id: Ie4c66e153ea925715795f3f7bbc280eb1c0fb819
Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
pid:3639
Diffstat (limited to 'libcamera')
| -rw-r--r-- | libcamera/SecCameraHWInterface.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index 3cc4876..cb871d2 100644 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -210,7 +210,6 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) p.setPreviewFormat("yuv420sp_custom"); #endif p.setPreviewSize(preview_max_width, preview_max_height); - p.setPreviewFrameRate(30); p.setPictureFormat(CameraParameters::PIXEL_FORMAT_JPEG); p.setPictureSize(snapshot_max_width, snapshot_max_height); @@ -218,7 +217,6 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) #ifdef SWP1_CAMERA_ADD_ADVANCED_FUNCTION p.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FORMATS, CameraParameters::PIXEL_FORMAT_YUV420SP); - p.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATES, "30"); p.set(CameraParameters::KEY_SUPPORTED_PICTURE_FORMATS, CameraParameters::PIXEL_FORMAT_JPEG); p.set(CameraParameters::KEY_VIDEO_FRAME_FORMAT, @@ -242,6 +240,8 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) "320x240,0x0"); p.set(CameraParameters::KEY_JPEG_THUMBNAIL_WIDTH, "320"); p.set(CameraParameters::KEY_JPEG_THUMBNAIL_HEIGHT, "240"); + p.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATES, "30"); + p.setPreviewFrameRate(30); } else { parameterString = CameraParameters::FOCUS_MODE_FIXED; p.set(CameraParameters::KEY_SUPPORTED_FOCUS_MODES, @@ -254,6 +254,8 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) "160x120,0x0"); p.set(CameraParameters::KEY_JPEG_THUMBNAIL_WIDTH, "160"); p.set(CameraParameters::KEY_JPEG_THUMBNAIL_HEIGHT, "120"); + p.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATES, "15"); + p.setPreviewFrameRate(15); } parameterString = CameraParameters::EFFECT_NONE; @@ -310,9 +312,12 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) p.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FPS_RANGE, "(15000,30000)"); p.set(CameraParameters::KEY_PREVIEW_FPS_RANGE, "15000,30000"); + p.set(CameraParameters::KEY_FOCAL_LENGTH, "3.43"); } else { - p.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FPS_RANGE, "(7500,30000)"); - p.set(CameraParameters::KEY_PREVIEW_FPS_RANGE, "7500,30000"); + p.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FPS_RANGE, "(7500,15000)"); + p.set(CameraParameters::KEY_PREVIEW_FPS_RANGE, "7500,15000"); + + p.set(CameraParameters::KEY_FOCAL_LENGTH, "0.9"); } parameterString = CameraParameters::WHITE_BALANCE_AUTO; @@ -358,7 +363,6 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) ip.set("image-effects", "original"); #endif - p.set(CameraParameters::KEY_FOCAL_LENGTH, "3.43"); p.set(CameraParameters::KEY_HORIZONTAL_VIEW_ANGLE, "51.2"); p.set(CameraParameters::KEY_VERTICAL_VIEW_ANGLE, "39.4"); @@ -381,7 +385,10 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) mSecCamera->setContrast(CONTRAST_DEFAULT); mSecCamera->setSharpness(SHARPNESS_DEFAULT); mSecCamera->setSaturation(SATURATION_DEFAULT); - mSecCamera->setFrameRate(30); + if (cameraId == SecCamera::CAMERA_ID_BACK) + mSecCamera->setFrameRate(30); + else + mSecCamera->setFrameRate(15); } CameraHardwareSec::~CameraHardwareSec() |