From b140054d4cfe92cad6fe6c336c624f942a4a16f6 Mon Sep 17 00:00:00 2001 From: Jason Maloney Date: Mon, 14 Mar 2011 16:05:15 -0500 Subject: [PATCH] Fix zoom ratios and other minor changes -- fixes force closes on double-tap-to-zoom and volume-up/down-zoom Change-Id: I83b76b0c753426e20f68486b87a0172efe6e5a62 --- libcamera/QualcommCameraHardware.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libcamera/QualcommCameraHardware.cpp b/libcamera/QualcommCameraHardware.cpp index 800da35..4cdae83 100644 --- a/libcamera/QualcommCameraHardware.cpp +++ b/libcamera/QualcommCameraHardware.cpp @@ -77,7 +77,7 @@ extern "C" { #define DEFAULT_PICTURE_WIDTH 1024 #define DEFAULT_PICTURE_HEIGHT 768 #define THUMBNAIL_BUFFER_SIZE (THUMBNAIL_WIDTH * THUMBNAIL_HEIGHT * 3/2) -//#define MAX_ZOOM_LEVEL 5 +#define MAX_ZOOM_LEVEL 20 #define NOT_FOUND -1 // Number of video buffers held by kernal (initially 1,2 &3) #define ACTIVE_VIDEO_BUFFERS 3 @@ -317,10 +317,10 @@ static const str_map effects[] = { { CameraParameters::EFFECT_NEGATIVE, CAMERA_EFFECT_NEGATIVE }, // tick { CameraParameters::EFFECT_SOLARIZE, CAMERA_EFFECT_SOLARIZE }, { CameraParameters::EFFECT_SEPIA, CAMERA_EFFECT_SEPIA }, - { CameraParameters::EFFECT_POSTERIZE, CAMERA_EFFECT_POSTERIZE }, +// { CameraParameters::EFFECT_POSTERIZE, CAMERA_EFFECT_POSTERIZE }, { CameraParameters::EFFECT_WHITEBOARD, CAMERA_EFFECT_WHITEBOARD }, { CameraParameters::EFFECT_BLACKBOARD, CAMERA_EFFECT_BLACKBOARD }, - { CameraParameters::EFFECT_AQUA, CAMERA_EFFECT_AQUA } +// { CameraParameters::EFFECT_AQUA, CAMERA_EFFECT_AQUA } }; // from qcamera/common/camera.h @@ -618,7 +618,7 @@ struct SensorType { static SensorType sensorTypes[] = { { "5mp", 2608, 1960, true, 2592, 1944,0x00000fff }, - { "5mp", 5184, 1944, false, 2592, 1944,0x00000fff }, + { "5mp", 5184, 1944, true, 2592, 1944,0x00000fff }, { "3mp", 2064, 1544, false, 2048, 1536,0x000007ff }, { "2mp", 3200, 1200, false, 1600, 1200,0x000007ff } }; @@ -1114,9 +1114,9 @@ void QualcommCameraHardware::initDefaultParameters() mParameters.set("nightshot-mode", "0"); mParameters.set("zoom-supported", "true"); - mParameters.set("zoom-ratios", "100,200,300,400,500,600,700,600,900"); + mParameters.set("zoom-ratios", "100,105,110,115,120,125,130,135,140,145,150,155,160,165,170,175,180,185,190,195,200"); mParameters.set("zoom", 0); - mParameters.set("max-zoom", "9"); // also set in startPreviewInternal ? + mParameters.set("max-zoom", MAX_ZOOM_LEVEL); // also set in startPreviewInternal ? mParameters.set(CameraParameters::KEY_PICTURE_FORMAT, CameraParameters::PIXEL_FORMAT_JPEG);