diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2012-05-21 06:10:49 +0000 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2012-05-21 06:10:54 +0000 |
| commit | 95d86e7d202a307b30803d958a8c7ca31ba16afd (patch) | |
| tree | d3c175f3ae7f4f8bbd451f724ae4a220de206273 | |
| parent | 9532a69a555f365bcdfc43336694455d90f0f6e5 (diff) | |
| download | common-linaro_android_4.0.4_origen.tar.gz | |
camera: update camera to VGA resolutionlinaro_android_4.0.4_origen
We scan camera nodes from video3 since video0,video1,video2
are related to overlay and hdmi
Change-Id: Ia2377a544f2d523067207ab4075a58b9315a6efc
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | libcamera/CameraHardware.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libcamera/CameraHardware.cpp b/libcamera/CameraHardware.cpp index f933f7b..257cf9b 100644 --- a/libcamera/CameraHardware.cpp +++ b/libcamera/CameraHardware.cpp @@ -28,9 +28,9 @@ #include <hal_public.h> #include <ui/GraphicBufferMapper.h> #include <gui/ISurfaceTexture.h> -#define MIN_WIDTH 320 -#define MIN_HEIGHT 240 -#define CAM_SIZE "320x240" +#define MIN_WIDTH 640 +#define MIN_HEIGHT 480 +#define CAM_SIZE "640x480" #define PIXEL_FORMAT V4L2_PIX_FMT_YUYV #define CAMHAL_GRALLOC_USAGE GRALLOC_USAGE_HW_TEXTURE | \ GRALLOC_USAGE_HW_RENDER | \ @@ -241,7 +241,7 @@ status_t CameraHardware::startPreview() #if 1 LOGI("startPreview: in startpreview \n"); mParameters.getPreviewSize(&width, &height); - for( i=0; i<10; i++) { + for( i=3; i<10; i++) { sprintf(devnode,"/dev/video%d",i); LOGI("trying the node %s width=%d height=%d \n",devnode,width,height); ret = camera.Open(devnode, width, height, PIXEL_FORMAT); @@ -399,7 +399,7 @@ int CameraHardware::pictureThread() mParameters.getPictureSize(&width, &height); mParameters.getPreviewSize(&width, &height); - for(i=0; i<10; i++) { + for(i=3; i<10; i++) { sprintf(devnode,"/dev/video%d",i); LOGI("trying the node %s \n",devnode); ret = camera.Open(devnode, width, height, PIXEL_FORMAT); @@ -469,7 +469,7 @@ status_t CameraHardware::setParameters(const CameraParameters& params) mParameters = params; mParameters.setPreviewSize(w,h); mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FPS_RANGE, supportedFpsRanges); - mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES, "320x240,352x288,640x480,720x480,720x576,848x480"); + mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES, "640x480,720x480,720x576,848x480"); return NO_ERROR; } |