diff options
| author | Sundar Raman <sunds@ti.com> | 2011-07-31 23:38:21 -0500 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-11 11:12:52 -0700 |
| commit | 4b85b17296d877e53a5197b2c0c8306c63839a12 (patch) | |
| tree | 2bd34afa922e737728b6b52fab519d5e9b1d8e87 /camera | |
| parent | ce8e32eddf46a966b6f637c30ad0c464631c1d86 (diff) | |
| download | omap4-aah-4b85b17296d877e53a5197b2c0c8306c63839a12.tar.gz | |
OMAP4 Camera HAL: CTS: Setting defaults for some parameters
focal length, horizontal and vertical angles
Addresses failures of following tests:
Change-Id: I36107b8c5cffe843ce7d167a607b9f9269f3ed26
Signed-off-by: Sundar Raman <sunds@ti.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/OMXCameraAdapter/OMXCapabilities.cpp | 5 | ||||
| -rw-r--r-- | camera/OMXCameraAdapter/OMXDefaults.cpp | 4 | ||||
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/camera/OMXCameraAdapter/OMXCapabilities.cpp b/camera/OMXCameraAdapter/OMXCapabilities.cpp index fc961fa..fa255e8 100644 --- a/camera/OMXCameraAdapter/OMXCapabilities.cpp +++ b/camera/OMXCameraAdapter/OMXCapabilities.cpp @@ -101,6 +101,7 @@ const CapPixelformat OMXCameraAdapter::mPixelformats [] = { { OMX_COLOR_FormatYUV420SemiPlanar, CameraParameters::PIXEL_FORMAT_YUV420SP }, { OMX_COLOR_Format16bitRGB565, CameraParameters::PIXEL_FORMAT_RGB565 }, { OMX_COLOR_FormatRawBayer10bit, TICameraParameters::PIXEL_FORMAT_RAW }, + { OMX_COLOR_FormatYUV420SemiPlanar, CameraParameters::PIXEL_FORMAT_YUV420P }, }; const CapFramerate OMXCameraAdapter::mFramerates [] = { @@ -982,7 +983,9 @@ status_t OMXCameraAdapter::insertDefaults(CameraProperties::Properties* params, params->set(CameraProperties::AUTO_EXPOSURE_LOCK, DEFAULT_AE_LOCK); params->set(CameraProperties::AUTO_WHITEBALANCE_LOCK, DEFAULT_AWB_LOCK); params->set(CameraProperties::MAX_NUM_METERING_AREAS, DEFAULT_MAX_NUM_METERING_AREAS); - + params->set(CameraProperties::FOCAL_LENGTH, DEFAULT_FOCAL_LENGTH); + params->set(CameraProperties::HOR_ANGLE, DEFAULT_HOR_ANGLE); + params->set(CameraProperties::VER_ANGLE, DEFAULT_VER_ANGLE); LOG_FUNCTION_NAME; return ret; diff --git a/camera/OMXCameraAdapter/OMXDefaults.cpp b/camera/OMXCameraAdapter/OMXDefaults.cpp index 670f562..f766d8c 100644 --- a/camera/OMXCameraAdapter/OMXDefaults.cpp +++ b/camera/OMXCameraAdapter/OMXDefaults.cpp @@ -61,7 +61,9 @@ const char OMXCameraAdapter::DEFAULT_WB[] = "auto"; const char OMXCameraAdapter::DEFAULT_ZOOM[] = "0"; const char OMXCameraAdapter::DEFAULT_MAX_FD_HW_FACES[] = "35"; const char OMXCameraAdapter::DEFAULT_MAX_FD_SW_FACES[] = "0"; - +const char OMXCameraAdapter::DEFAULT_FOCAL_LENGTH[] = "4.6"; +const char OMXCameraAdapter::DEFAULT_HOR_ANGLE[] = "54.8"; +const char OMXCameraAdapter::DEFAULT_VER_ANGLE[] = "42.5"; const char OMXCameraAdapter::DEFAULT_AE_LOCK[] = "false"; const char OMXCameraAdapter::DEFAULT_AWB_LOCK[] = "false"; const char OMXCameraAdapter::DEFAULT_MAX_NUM_METERING_AREAS[] = "0"; diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index 2da87de..1c60786 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -714,6 +714,9 @@ private: static const char DEFAULT_MAX_NUM_METERING_AREAS[]; static const char DEFAULT_LOCK_SUPPORTED[]; static const char DEFAULT_LOCK_UNSUPPORTED[]; + static const char DEFAULT_FOCAL_LENGTH[]; + static const char DEFAULT_HOR_ANGLE[]; + static const char DEFAULT_VER_ANGLE[]; OMX_VERSIONTYPE mCompRevision; |