summaryrefslogtreecommitdiffstats
path: root/include/camera/CameraParameters.h
Commit message (Collapse)AuthorAgeFilesLines
* camera: fix samsung/qcom conflictcodeworkx2012-07-081-2/+4
| | | | | | hello ifdef hell Change-Id: I76bede141dfd4fd4f32b5a5aa8987fb255c207a5
* camera: ISO mode support (1/2)athurh2012-07-081-3/+5
| | | | Change-Id: Icdd4f676ea15b933985a9505fcf316aeb7c50ce2
* camera: Add parameters for HTC msm8960Ethan Chen2012-05-211-0/+11
| | | | | | | Enable with QCOM_HARDWARE. Add MIN_SATURATION, MIN_SHARPNESS, MIN_CONTRAST, CONTI_BURST modes. Change-Id: Ia744e32620629967e1fc17fa4c3c08016bdaa370
* camera: Add parameters for some Samsung camerasSteve Kondik2012-05-151-0/+6
| | | | | | | * Enable with SAMSUNG_CAMERA_HARDWARE * Adds anti-shake, metering, and wdr modes. Change-Id: I080c90e11fcb8fa48900c01a454868f173f61eb0
* Add missing symbols for HTC 8660 camera HAL.Ed Carrigan2012-03-291-0/+21
| | | | Change-Id: Ia542981bc07cfb22da1bae75af5a4554f7100ef5
* Add customized parameters for qcom camera features.Ankit Premrajka2012-03-271-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following submissions to CAF: camera: add custom camera parameters to hardware java file. Change-Id: Ic2b363df6d25a0c3a49aed30e717d10874f533ae Camera: Add support for wavelet denoise Change-Id: I97be72615fe5909987ac430034bbdc16f2d20509 Camera : Add support for histogram in frameworks Change-Id: Ibf751c3b2d488f4be0afaaa3e994372bafeffbe7 Camera: Add ZSL support in framework. Change-Id: I4e863020d7d407d9c3936beb83dc7abf385c4654 Camera: Add touch AF/AEC support in ICS framework In, ICS the old touch AF/AEC functions getTouchIndexAf(), setTouchIndexAf() etc are no longer valid. Added new functions to get the center of touched area. Change-Id: I37d00040f895cd8a4de2e2a438971aa2d9c1a045 Camera: Add support for Red eye reduction Change-Id: Iada280ac33aee8b1114dc40d8d79e0e47ad5c2fd Conflicts: api/current.txt Camera: Enable streaming texture and YV12 feature Change-Id: I814c92b469e0f25baef0ce80338761d1e6443085 Camera: Add frameworks support for high frame rate Change-Id: I9722e9b7e61433651ab5f76f76208853eb1fd849 Camera: Simplify ASD menu and best mode menu. Change-Id: Ia7a1eca9268eec021a6e2c3f7ce2a932e8819d50 Camera : Macro definition change. PIXEL_FORMAT_YV12 to "yuv420p" Why: CTS testcase is expecting "yuv420p" as the format string for YV12 mode. CRs-Fixed: 328252 (cherry picked from commit 0a263f67b75497e4b95b9de8c370ed9496ab59ef) Change-Id: I66f418a52775a969d81bcb332bbe500370e3ab7c Camera: Changes for face detection Change-Id: I7b2172e8690d6e23762e42f5888fecbfda15ba61 Camera: Add support for burst count Change-Id: I4488a5eac1eebb0b5c8e2cc7cbbe7be0c7301be7 Camera: enable HDR feature (cherry picked from commit e40770bbdadd925fc1e07a08249a15981b961570) Change-Id: Ie9ca3066e8e53710bf292d047a3724aefc029854 Camera : Add API to find fullsize liveshot support Change-Id: I3c2fc3578decbe5cf87fded5362f317df0b40b5e (cherry picked from commit 65d80f04892776eec1c19c844eacb8c454b4bd1a) Camera: Set default camera area string The default invalid value for KEY_FOCUS_AREA and KEY_METERING_AREA is changed to "(0,0,0,0,0)" CRs-fixed: 334934 Change-Id: I354802c8611ee5c00a591b96b1a1ca04926969cb Camera: Change the scenemode names in framework To comply with ICS API Specification, SCENE_MODE_AUTO changed to SCENE_MODE_ASD SCENE_MODE_OFF changed to SCENE_MODE_AUTO Change-Id: I8e744f10c728f469923b09f69d6d64bc5c7c6850 Camera : Framework changes for camcorder UI menu Change-Id: Iff9e9021da44b67f81a24c828b960113ee249248 Camera : Remove unwanted video resolution in Framework - FWVGA, WQVGA resolution UI options are removed for camcorder. Change-Id: If621140966b01dbc8c30a4d161e6771528b8adda Camera : Enable FWVGA and WQVGA resolutions in camcorder media profiles Change-Id: Iad9cc33f7b6d8eb7de21df372c016edeef0b99ba Unlock camera AWB lock only when white-balance is changed. bug:5633546 Change-Id: I90bb4b5b445daedf38a64e2f8fb980fc0f0aaa81 Change-Id: Ie3cc15132489502e64321776d49d96846b5705d6
* framework/base: Add customized parameters for camera features.Shuzhen Wang2012-03-181-1/+215
| | | | | | | | Patchset 1: Add QCOM_HARDWARE ifdefs. Patchset 2: Don't need to ifdef snprintf over sprintf. Change-Id: Id39c71976823ad18627f1e14d1b5e2fd0597c82e Signed-off-by: Evan McClain <aeroevan@gmail.com>
* Fix file references in commentsdavid reid2012-03-041-5/+5
| | | | | | | | Extremely low hanging fruit, but change the refs in the comments to point at the correct file. This may help someone else having to go look for the correct file. Change-Id: I60f9adea1b37c49265b37199278182873844385e
* Update camera continuous autofocus javadoc.Wu-cheng Li2011-10-281-9/+11
| | | | | | | | | | Suppose applications call autoFocus in CAF picture mode. If CAF is in the middle of scanning, the picture is very likely to be blurry. Change focus callback to return when the scanning finishes. bug:5514415 Change-Id: Ibcb8f92a5263d7dbd7cce54df3617fb21c6255d4
* Improve camera javadoc and fix some errors.Wu-cheng Li2011-10-131-10/+21
| | | | | bug:5169599 Change-Id: Ic2205770753ff462135f884fee0a888ca8ec832d
* Add video stabilization control to Camera parameters.Eino-Ville Talvala2011-10-121-0/+19
| | | | | | | | | Hardware video stabilization reduces camera shake in preview and in recorded videos. It has no effect on still image capture. Convenience accessor methods hidden for now. Change-Id: Ie18450bff662b2ef98b85d19719beefc180975fc
* Update camera javadoc about AE and AWB lock.Wu-cheng Li2011-09-221-16/+6
| | | | | | | | | - Autofocus does not lock AE and AWB. - stopPreview and takePicture do not clear AE and AWB locks. bug:5356404 Change-Id: I55d9b35f4ff746ecd2bff112c2674f1aa2543aca
* Add video snapshot camera parameter.Wu-cheng Li2011-09-011-0/+19
| | | | | | | | The API is still hidden. bug:5187868 Change-Id: I59e1b5774ca32be049723d1a0887faa90d8884bb
* Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE.Wu-cheng Li2011-08-181-6/+17
| | | | | | | The API is still hidden. bug:5086125 Change-Id: I69268a95ad6aae249771d3a8dfb423ffe2d87081
* Add camera bayer image format.Wu-cheng Li2011-08-041-0/+3
| | | | | | | | The API are hidden. bug:5086073 Change-Id: Ic9a53e5d5007ad3f12a28406ee25098227f14cbc
* Add camera recording hint parameter.Wu-cheng Li2011-08-021-0/+11
| | | | | | | The API is still hidden. bug:4266229 Change-Id: I5e4c24e9e2808582aecb55ac4f1d5be3ed7e36a2
* Add camera face detection API.Wu-cheng Li2011-07-271-0/+10
| | | | | | | API are still hidden. bug:4460717 Change-Id: I1a515061f141a89bd61c875257712789fb15d2d4
* Merge "Improve android.hardware.Camera.Area javadoc."Wu-cheng Li2011-06-071-2/+2
|\
| * Improve android.hardware.Camera.Area javadoc.Wu-cheng Li2011-06-071-2/+2
| | | | | | | | | | bug:4553469 Change-Id: Iae88af354fee4925cb7978572c27f6dd5595ca59
* | CameraParameters: add PIXEL_FORMAT_RGBA8888Iliyan Malchev2011-06-061-0/+1
|/ | | | | Change-Id: I2780e936f5b4628d506ac4e6947b78ef831fbde8 Signed-off-by: Iliyan Malchev <malchev@google.com>
* Add auto-white balance locking to the Camera API.Eino-Ville Talvala2011-05-171-15/+44
| | | | | | | | | | | Adds a new camera parameter for locking auto-white balance to its current value. Also adds a function for checking if auto-white balance lock is supported by the current platform. Lock semantics match that of the auto-exposure lock. Hidden for now. Change-Id: Id59339a4be84d55c1b0b8473d765b6aa765999b2
* Add an auto-exposure lock feature to the Camera API.Eino-Ville Talvala2011-05-021-0/+20
| | | | | | | | | | Adds a new camera parameter for locking auto-exposure to its current value. Also adds a function for checking if auto-exposure lock is supported by the current platform. Hidden for now. Change-Id: Id452371191ab220318ce2cb98b8ee91bdde9aab6
* Clarify the meaning of weight in the focus and metering area HAL.Eino-Ville Talvala2011-04-251-9/+12
| | | | | | | | | Weigh values must be less than 1000, but have no restriction on their sum. Weights should be interpreted as per-pixel values, meaning larger areas will have more influence over focus/metering than smaller areas of the same weight. Change-Id: I988b74f988ddba2ff0c49d078ff3174b47cbae18
* Add camera metering area API.Wu-cheng Li2011-04-131-0/+38
| | | | | | | The API are still hidden. bug:3475893 Change-Id: Id4147528def5e0fe067e1a3ed315fa34c14a0640
* Add camera focus area API.Wu-cheng Li2011-04-081-0/+38
| | | | | | | | The API are still hidden. bug:3475893 Change-Id: I92405c9e332b7fb141788cda7ebc9705dd666c67
* Add YV12 preview format to camera parameter constants.Wu-cheng Li2011-02-241-2/+1
| | | | | bug:3463624 Change-Id: I8f2992dadfd3fb9e3c9d67743e52da7f3212827e
* Add preferred preview size support in the camera frameworkJames Dong2010-11-301-0/+23
| | | | | | bug - 3237021 Change-Id: Ica8a3ae5cfbee462b74de98770e33277186c9a2b
* am fb6f4505: am 589e8381: Merge "Improve camera documentation." into gingerbreadWu-cheng Li2010-11-191-10/+17
|\ | | | | | | | | * commit 'fb6f4505ba5c227cebb73f1269b0af5d92e6e5e6': Improve camera documentation.
| * Improve camera documentation.Wu-cheng Li2010-11-191-10/+17
| | | | | | | | | | bug:3212606 Change-Id: Iee7106e4665c08a4c75471114010b75d63ac74ce
* | Video size retrieval/configuration support in camera halJames Dong2010-10-031-0/+31
| | | | | | | | | | | | | | | | | | This is the first part of the camera hal change required for 0-memcpy of input video frames for video recording. o removed check in setVideoSize()/getVideoSize() for impl consistency Change-Id: I01274a62b9f9eaf32154d98f8d0bfedacf645698
* | am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to ↵Wu-cheng Li2010-09-211-6/+8
|\ \ | |/ | | | | | | | | | | | | | | FOCUS_MODE_CONTINUOUS_VIDEO. Merge commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd' * commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd': Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
| * Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.Wu-cheng Li2010-09-211-6/+8
| | | | | | | | | | | | | | | | | | | | This constant is not public yet. Continuous autofocus should behave differently in still camera and camcorder. In camcorder, lens movement may be more smooth. And the triggers to start a new focus search may be different. If there is a need, FOCUS_MODE_CONTINUOUS_PHOTO can be added in the future. Change-Id: I05df9e491aca37829be3df92a73b952f26c86a4a
* | Add YUV420P color format support for video output from camera halJames Dong2010-09-161-1/+4
|/ | | | Change-Id: I5c8266348d0840361c8095ce351ac85c44d4068f
* Remove camera metering mode API.Wu-cheng Li2010-08-301-17/+0
| | | | | | Metering mode is not supported yet. Change-Id: Id6906d6ab0cd1a9dcbc5c303d8d5081b2cda699e
* Add camera fps range API.Wu-cheng Li2010-08-201-0/+15
| | | | | | | Original preview frame rate API assumes the frame rate is fixed. It does not not work with auto frame rate camera. Change-Id: I38f7122ac8ec844ffd63558dc0763ffa17b0926a
* Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGENipun Kwatra2010-08-191-0/+1
| | | | | | | | Moved functionality to parse string of sizes from getSupportedPictureSizes to parseSizesList. Added getSupportedPreviewSizes which returns a list of supported preview sizes. Change-Id: I41d4f62f9f1641e9e9258aa2ebaeda13ba846c02
* Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGENipun Kwatra2010-08-191-0/+16
| | | | | | | | Also added a struct 'Size' containing a width and a height field. Modified parse_size to optionally set an end pointer pointing to the character after the found size. Change-Id: I0c95ebf1ad4684721b32165f363db7d4d15a1b19
* Document that autoFocus must be called in auto and macro mode.Wu-cheng Li2010-08-171-2/+6
| | | | Change-Id: Ia52f8bc8a75a7473edff50326a4a0467f4295e6a
* Improve camera documentation.Wu-cheng Li2010-08-121-13/+17
| | | | Change-Id: I3c9e5e6de5ce64b8d7d892483930238fa9cc247c
* Add KEY_SUPPORTED_METERING_MODES and fix some typos.Wu-cheng Li2010-06-041-0/+3
| | | | | bug:2737111 Change-Id: I108ae7057786921bf99385ad66dbc1f02d6a1448
* Add camera metering mode API.Wu-cheng Li2010-06-031-0/+13
| | | | | bug:2737111 Change-Id: Ie986fee56ebeaaed2d2efb757701dfe3ffdec8d8
* Add video frame parameter.Wu-cheng Li2010-05-281-3/+11
| | | | | | | | The image format of preview frames and video frames may be different. We need another parameter for video frame format. bug:2720893 Change-Id: I966a31b0ce8cab25cdde65db65a18c8cbe9c7bd6
* Improve GPS EXIF parameters comments.Wu-cheng Li2010-05-241-6/+9
| | | | Change-Id: I33f7487821b283fe746baa09a71a703ae763d66d
* Fix build error.Wu-cheng Li2010-05-151-1/+1
| | | | | | Original name INFINITY conflicts with the macro in math.h. Change-Id: I9845ed84fca17813dd971239a902cc1e0bad1e3e
* Add camera focus distances API.Wu-cheng Li2010-05-151-0/+21
| | | | | | | | Applications can use this API to estimate the distance between the subject and the camera. bug:1955650 Change-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27
* am d8c33747: am 78624e41: Add remove method in CameraParameters class.Wu-cheng Li2010-05-121-9/+2
|\ | | | | | | | | | | | | Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken * commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728': Add remove method in CameraParameters class.
| * Add remove method in CameraParameters class.Wu-cheng Li2010-05-111-9/+2
| | | | | | | | | | bug:2672651 Change-Id: I537c817b5ca6a3d925f22febe9a5769156354d00
* | Add continuous focus mode constant.Wu-cheng Li2010-05-101-0/+6
|/ | | | | bug:2612447 Change-Id: I9bc3f5a47ad50722a265d50b1d28fb82a2253dc9
* Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.Wu-cheng Li2010-04-101-0/+7
| | | | | bug:2544367 Change-Id: If122a7745e080f9e4bffb15dc4930d71f0421867
* Add camera parameter string constant for "true".Wu-cheng Li2010-03-081-0/+3
| | | | | bug:2458926 Change-Id: I11eaae8ff031765e23f2627ded5873eabc09cead