diff options
| author | Sundar Raman <sunds@ti.com> | 2011-10-07 18:11:37 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-10-12 11:29:19 -0700 |
| commit | d74c6c70336d87edf60c07b6c7b25001cf362554 (patch) | |
| tree | 25ceec438ce07c555a47bee814c7cfbd6859d54c | |
| parent | 5aaea509adda30aa70ce19dc91a9dd1f1e45cd61 (diff) | |
| download | hardware_ti_omap4-d74c6c70336d87edf60c07b6c7b25001cf362554.zip hardware_ti_omap4-d74c6c70336d87edf60c07b6c7b25001cf362554.tar.gz hardware_ti_omap4-d74c6c70336d87edf60c07b6c7b25001cf362554.tar.bz2 | |
CameraHAL: Restore zoom stages back to 60
This provides for a smooth zoom experience with immediate zoom
This reverts commit a38ea5631d139c3d5ffd4e181df2216dbce1b10c.
Fixes b/5251916
Change-Id: If1724ec2ad5d3106e10ee5c2e691f99c19675eaf
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCapabilities.cpp | 30 | ||||
| -rw-r--r-- | camera/OMXCameraAdapter/OMXZoom.cpp | 30 | ||||
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 2 |
3 files changed, 46 insertions, 16 deletions
diff --git a/camera/OMXCameraAdapter/OMXCapabilities.cpp b/camera/OMXCameraAdapter/OMXCapabilities.cpp index 3b344b5..4e8ea2f 100644 --- a/camera/OMXCameraAdapter/OMXCapabilities.cpp +++ b/camera/OMXCameraAdapter/OMXCapabilities.cpp @@ -107,35 +107,65 @@ const CapFramerate OMXCameraAdapter::mFramerates [] = { const CapZoom OMXCameraAdapter::mZoomStages [] = { { 65536, "100" }, + { 68157, "104" }, { 70124, "107" }, + { 72745, "111" }, { 75366, "115" }, + { 77988, "119" }, { 80609, "123" }, + { 83231, "127" }, { 86508, "132" }, + { 89784, "137" }, { 92406, "141" }, + { 95683, "146" }, { 99615, "152" }, + { 102892, "157" }, { 106168, "162" }, + { 110100, "168" }, { 114033, "174" }, + { 117965, "180" }, { 122552, "187" }, + { 126484, "193" }, { 131072, "200" }, + { 135660, "207" }, { 140247, "214" }, + { 145490, "222" }, { 150733, "230" }, + { 155976, "238" }, { 161219, "246" }, + { 167117, "255" }, { 173015, "264" }, + { 178913, "273" }, { 185467, "283" }, + { 192020, "293" }, { 198574, "303" }, + { 205783, "314" }, { 212992, "325" }, + { 220201, "336" }, { 228065, "348" }, + { 236585, "361" }, { 244449, "373" }, + { 252969, "386" }, { 262144, "400" }, + { 271319, "414" }, { 281149, "429" }, + { 290980, "444" }, { 300810, "459" }, + { 311951, "476" }, { 322437, "492" }, + { 334234, "510" }, { 346030, "528" }, + { 357827, "546" }, { 370934, "566" }, + { 384041, "586" }, { 397148, "606" }, + { 411566, "628" }, { 425984, "650" }, + { 441057, "673" }, { 456131, "696" }, + { 472515, "721" }, { 488899, "746" }, + { 506593, "773" }, { 524288, "800" }, }; diff --git a/camera/OMXCameraAdapter/OMXZoom.cpp b/camera/OMXCameraAdapter/OMXZoom.cpp index 30f7e45..eec7691 100644 --- a/camera/OMXCameraAdapter/OMXZoom.cpp +++ b/camera/OMXCameraAdapter/OMXZoom.cpp @@ -31,21 +31,21 @@ namespace android { const int32_t OMXCameraAdapter::ZOOM_STEPS [ZOOM_STAGES] = { - 65536, 70124, - 75366, 80609, - 86508, 92406, - 99615, 106168, - 114033, 122552, - 131072, 140247, - 150733, 161219, - 173015, 185467, - 198574, 212992, - 228065, 244449, - 262144, 281149, - 300810, 322437, - 346030, 370934, - 397148, 425984, - 456131, 488899, + 65536, 68157, 70124, 72745, + 75366, 77988, 80609, 83231, + 86508, 89784, 92406, 95683, + 99615, 102892, 106168, 110100, + 114033, 117965, 122552, 126484, + 131072, 135660, 140247, 145490, + 150733, 155976, 161219, 167117, + 173015, 178913, 185467, 192020, + 198574, 205783, 212992, 220201, + 228065, 236585, 244449, 252969, + 262144, 271319, 281149, 290980, + 300810, 311951, 322437, 334234, + 346030, 357827, 370934, 384041, + 397148, 411566, 425984, 441057, + 456131, 472515, 488899, 506593, 524288 }; diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index 0e77692..9f938be 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -67,7 +67,7 @@ namespace android { #define DEFAULT_THUMB_WIDTH 160 #define DEFAULT_THUMB_HEIGHT 120 #define FRAME_RATE_FULL_HD 27 -#define ZOOM_STAGES 31 +#define ZOOM_STAGES 61 #define FACE_DETECTION_BUFFER_SIZE 0x1000 #define MAX_NUM_FACES_SUPPORTED 35 |