summaryrefslogtreecommitdiffstats
path: root/camera/CameraParameters.cpp
Commit message (Collapse)AuthorAgeFilesLines
* CameraHAL: Moved Camera HAL sources out of namespace androidDaniel Levin2012-07-251-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | C++ namespace android:: is reserved for base Google Android types to avoid current and further conflicts with 3rd party code. Having TI Camera HAL under namespace android:: violates this rule, adding potential conflicts. This patch moves libtiutils and Camera HAL code out of namespace android:: to custom local namespaces. Putting camera code under namespace android and 'using namespace android' is not allowed anymore. All C++ Android types should have android:: namespace prefix explicitly. Next namespaces added: - Ti:: - placeholder for all custom code - Ti::Utils:: - common utility helper library - Ti::Camera:: - Camera HAL code Also added Ti::status_t as typedef for android::status_t. Change-Id: Ie8cc00d6d6bd4e8a8ddf089421010c370ee40ebe Signed-off-by: Daniel Levin <dendy@ti.com>
* CameraHAL: Portability changesDaniel Levin2012-07-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | 1. Moved common definitions to Global.h header: - CAMHAL_LOG* macros (also added CAMHAL_LOGI and CAMHAL_LOGW) - CAMHAL_ASSERT* macros - CAMHAL_UNUSED macro 2. Renamed NV12_resize.c to NV12_resize.cpp 3. Added common math functions into UtilsGlobal.h header: - min(a, b) - returns min of a and b - max(a, b) - returns max of a and b - bound(min, a, max) - return nearest value to a in scope [min..max] - floor(a) - round a to lower integer - round(a) - round a to nearest integer 4. Portability: - Fixed LOG* macros to use appropriate CAMHAL_LOG* wrappers. - Reworked the Android.mk to include proper directories depending on current pastry. Change-Id: I6fbd1ee02d8af2195b91cc357ddcf554fe77f495 Signed-off-by: Daniel Levin <dendy@ti.com>
* CameraHal: Queries picture sizes dynamicallyEmilian Peev2012-07-251-36/+47
| | | | | | | | | | | | | | | | | | | | | | | - Currently the picture sizes are static and will not change with the capture mode. For some use-cases this is not sufficient. To overcome this the Properties class is extended to support an operating mode, which will switch the supported properties depending on the current setting. Additionally the Ducati capabilities are queried not only for one capture mode alone but for all use-cases in 2D and 3D. As a result once the camera client switches the capture mode, the supported picture sizes will change inside CameraParameters retrieved through a subsequent "getParameters()" call. Related UI patch: http://review.omapzoom.org/#/c/21685 Signed-off-by: Emilian Peev <epeev@mm-sol.com> Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: Ib9f02ede94ff76feb86b3422dc453dfd8782ee43
* CameraHAL: Simplified mechanical misalignment parametersDaniel Levin2012-07-251-1/+1
| | | | | | | | | | | | | | | | Turned mechanical misalignment parameters from list to boolean parameter: "mechanical-misalignment-correction-supported" Replaced custom "enable" and "disable" tokens with standard Android "true" and "false". Must be used together with: http://review.omapzoom.org/#/c/21700/ Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I45dbe39eb03d3642e127175b2ebc6021fb38e9a8
* CameraHAL: Removed preferred video sizeDaniel Levin2012-07-251-1/+0
| | | | | | | | Removed token are not used anymore. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: Id36633758bdbd978bd2d34ed683264ed4da09c7b
* Merge branch 'cpcam/DEV_DB54' into cpcam/latestTyler Luu2012-07-251-0/+2
|\ | | | | | | | | | | | | Conflicts: camera/inc/CameraHal.h Change-Id: I6f96dedfdbf3956fbbf796aa7b768ae13c9c61df
| * CameraHal: Adds extended framerate rangesEmilian Peev2012-07-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | - This change will limit the reported framerate capabilities to a certain threshold. If the camera does support higher framerates, then these capabilities will be made available via custom keys. Change-Id: I31d99387c710881dcb76b698fa0af58c09096868 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* | CameraHal: Implement absolute exp/gain bracketingTyler Luu2012-07-251-0/+3
|/ | | | | | | | | | | | | User sets KEY_EXP_GAIN_BRACKETING_RANGE with string of (exp, gain) pairs and KEY_BURST with the number of pairs Example: Absolute Gain: "(100,300),(200,300),(400,300),(800,300),(1600,300)" Change-Id: Id875e475051466eeb92c3e528762fc4ac37db502 Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com>
* CameraHAL: VFR ranges fixesPavel Nedev2012-07-251-2/+0
| | | | | | | | | | | | | | | | | | Supported VFR ranges gotten from Ducati and supported fixed FPS filled to be within those ranges. Several unnecessary parameter keys removed. FPS handling in CameraHAL fixed. Added class FpsRange with sort() method that conforms Android requirement about FPS ranges order: - The list is sorted from small to large (first by maximum fps and then minimum fps). Merged fixed FPS values into FPS ranges. Made the last (maximum) of fixed and variable FPS ranges to be default. Signed-off-by: Pavel Nedev <pnedev@mm-sol.com> Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I634065fada4e3adc5a6bd7b2986a9b9caac661dc
* CameraHal: Add key for 3d subsampled resolutionsIvan Evlogiev2012-07-251-0/+2
| | | | | | | | | | | Supported subsampled resolutions are communicated through new keys fpr preview and capture. Google standart keys for supported preview sizes are filled for preview and capture based on current selected layout Change-Id: I787e411f35103723b4085e297c3dfaf421f10b2a Signed-off-by: Ivan Evlogiev <x0099089@ti.com>
* CameraHAL: Add picture encoding format selectionPavel Nedev2012-07-251-1/+2
| | | | | | | | Add image port encoding format selection. The supported formats are taken from the camera capabilities. Change-Id: I44d327410e2d669d57532d4c183b09030d598508 Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>
* CameraHAL: Manual exposure and gain addedPavel Nedev2012-07-251-0/+6
| | | | | | | | Added supported min/max + step values for manual gain and exposure. Added manual gain and exposure params and settings. Change-Id: I15cac8b3fb4dbe0db46bb7fcf7d64805ad4a6db1 Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>
* CameraHal: Adds support for GBCE/GLBCE in OMX CapabilitiesEmilian Peev2012-07-251-0/+3
| | | | | Change-Id: I3469f234647316be4d2bb7c32a7ea23e66af996f Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* CameraHal: VSTAB, VNF API updatesEmilian Peev2012-07-251-1/+2
| | | | | | | | | - Adds supported values for VNF and VSTAB. - VNF API changes a bit in order to resemble the Google supported one for VSTAB. Signed-off-by: Emilian Peev <epeev@mm-sol.com> Signed-off-by: Vicky Martinez-DeFrain <a0869710@ti.com> Change-Id: I760049e4fa3cfd43fffcf0bafdad618c4df8d47b
* CameraHAL: Stereo 3D frame layout parameters addedIvan Evlogiev2012-07-251-4/+9
| | | | | | | | | | | S3D frame layout params added for preview and capture. Capabilities for the above also added (to be read from Ducati). First supported value taken as default. Different supported 3D resolutions added depending on frame layouts supported. Change-Id: I819098ef3c7a4cd6ba49ec17c9c26d2610933145 Signed-off-by: Pavel Nedev <pnedev@mm-sol.com> Signed-off-by: Ivan Evlogiev <x0099089@ti.com>
* Camera Hal: Add supported capture modesIvan Evlogiev2012-07-251-0/+1
| | | | | | | | Add supported capture modes, so the camera app can filter them from the menu Change-Id: I767a8cca6e0f9c72ed6228627bb9ce0ad3376c33 Signed-off-by: Ivan Evlogiev <x0099089@ti.com>
* CameraHAL: Mechanical Misalignment parameter addedIvan Evlogiev2012-07-251-0/+2
| | | | | | | | | Mechanical misalignment param added in case of Stereo camera. Supported values also added as capabilities. Change-Id: I88b6e1f842b6d2ae60a096172da9193f53d16b0c Signed-off-by: Yordan Lilov <ylilov@mm-sol.com> Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>
* CameraHAL : Add AutoConvergence modeIvan Evlogiev2012-07-251-2/+5
| | | | | | | | | | | | Added Autoconvergence mode in the interface to the application. Set proper supported Autoconvergence modes to the application based on ducati camera capabilities. Supported manual convergence value boundaries and step also added as parameters. Change-Id: I1331dfac603d625d54684fbf3b27a374d0979208 Signed-off-by: Ivan Evlogiev <x0099089@ti.com> Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>
* CameraHal: Enables sensor overclock during FullHD on OV5640Emilian Peev2012-07-251-0/+10
| | | | | Change-Id: Idc133ee4a6bc9f7703a6208195ac123c33ff2300 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* CameraHal: Adapt to new framework vstab paramTyler Luu2011-10-141-1/+1
| | | | | | | | change to use the new KEY_VIDEO_STABILIZATION parameter from the framework instead of using TICameraParameter definition. Change-Id: Ifed4c147e6ad3c02b35772343d9d339ab1402eac Signed-off-by: Tyler Luu <tluu@ti.com>
* omap4xxx: camera: send different preview and video buffers for MMS modeAkwasi Boateng2011-10-071-0/+4
| | | | | | | | | | | | | | | | | | Fixes b/5265389 b/5156090 1. Add support to send different preview and video buffers to framework in MMS mode. 2. For resolutions less than or equal to QVGA, preview resolution will be changed to a bigger resolution matching the aspect ratio of the preview resolution. 3. During record the changed resolution will be resized to the original resolution and sent to the encoder. 4. Modified NV12 resizer routine to account for frame offset and stride to avoid double memcpy of the buffers Change-Id: If66aa1fd861078d0a63b4a77a1bdc20d4c6bccda Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHAL: Fixes for FPS range configurationSundar Raman2011-09-191-3/+3
| | | | | Change-Id: Idfc506812d6e0f1d88bdc5d7d62c159f9c9ad642 Signed-off-by: Sundar Raman <sunds@ti.com>
* Set default fps range for video mode to 24<->30Akwasi Boateng2011-09-091-0/+2
| | | | | | | | Hack to allow image mode fps=15 and vide mode fps = 24 Change-Id: Ie2a4b3d5c7e32515a1af948fa65c934baaf3e1a9 Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
* CameraHal: Set KEY_VIDEO_SNAPSHOT_SUPPORTED defaultTyler Luu2011-09-021-0/+1
| | | | | Change-Id: I106a62bc752398f52224d1b1b7ef78a703ab1f17 Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHAL: Enable GBCE by defaultSundar Raman2011-08-311-0/+1
| | | | | | | Needed to improve image quality Change-Id: I727b8ee21a186e1616e690f85075e4e8a64617f9 Signed-off-by: Sundar Raman <sunds@ti.com>
* initial commitIliyan Malchev2011-08-081-0/+184
Change-Id: I8f7a7eeece0e516efa486b77e9d97805c0e65d3e Signed-off-by: Iliyan Malchev <malchev@google.com>