summaryrefslogtreecommitdiffstats
path: root/camera
Commit message (Collapse)AuthorAgeFilesLines
* Camera2: Add prepare for output streamsEino-Ville Talvala2015-04-152-2/+45
| | | | | | | | | The prepare call asynchronously pre-allocates buffers for a given output stream, and then fires the onPrepared callback. Not implemented for Camera2Device or used in Camera2Client. Change-Id: I1cccdfff846dd6985133c591dbdceed823929ade
* camera2: add reprocess supportChien-Yu Chen2015-04-132-0/+83
| | | | | | | Add support to create input stream, submit reprocess capture requests, and receive reprocess capture results. Change-Id: Iee2d4313f3d52616a484eaea7a28f5ef9d8a674b
* camera2: Enforce client eviction on user switch.Ruben Brunk2015-03-311-0/+16
| | | | | Bug: 19186859 Change-Id: I172a2ce46c8e8a131ae7e8dd99d60c5f4f0d6668
* Merge "Camera: fix metadata assertion"Yin-Chia Yeh2015-03-251-1/+1
|\
| * Camera: fix metadata assertionYin-Chia Yeh2015-03-241-1/+1
| | | | | | | | | | Bug: 19897963 Change-Id: I6b383c4750f31691a1c02e927bbeb0c1998a9eff
* | camera2: Remove ProCamera.Ruben Brunk2015-03-208-2227/+8
|/ | | | | Bug: 19186859 Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
* Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-193-20/+92
|\
| * Camera: plumbing rotation field throughYin-Chia Yeh2015-03-183-20/+92
| | | | | | | | Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
* | Merge "camera2: Add camera client eviction enforcement."Ruben Brunk2015-03-191-0/+4
|\ \ | |/ |/|
| * camera2: Add camera client eviction enforcement.Ruben Brunk2015-03-181-0/+4
| | | | | | | | | | | | | | | | | | - This updates the CameraService to implement client eviction behavior based on process priority. Bug: 19186859 Change-Id: I646939b1cdf1a2237c4e5044164d55a2542cf36e
* | Camera: Wire up dataSpace, clean up ICameraDeviceUserEino-Ville Talvala2015-03-061-13/+2
|/ | | | | | | - Remove unused arguments from ICameraDeviceUser::createStream - Add dataSpace as a stream parameter, plumb it through everything Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb
* Merge "Camera: Remove RAW_SENSOR in favor of RAW16"Eino-Ville Talvala2015-02-202-2/+2
|\
| * Camera: Remove RAW_SENSOR in favor of RAW16Eino-Ville Talvala2015-02-192-2/+2
| | | | | | | | Change-Id: I69ca24c69f58be958efdef300b127401d2b2e880
* | camera: implement flashlight controlChien-Yu Chen2015-02-123-2/+55
|/ | | | | | | | Implement flashlight API for module v2.4 by calling module APIs and by for hal v2 and v3 by using CameraDeviceBase. Bug: 2682206 Change-Id: Ib8b77f6fd462489d672f27e14fe37801d35b7544
* am 81898637: am 16e8d463: Merge "camera2: fix various BpCameraDeviceUser ↵Eino-Ville Talvala2015-02-031-4/+4
|\ | | | | | | | | | | | | methods to return correct result." * commit '8189863774bd479f0060bbe1e4ce74dadcfc55c3': camera2: fix various BpCameraDeviceUser methods to return correct result.
| * camera2: fix various BpCameraDeviceUser methods to return correct result.John Lin2015-02-031-4/+4
| | | | | | | | | | | | | | | | - submitRequest*(): res is the request ID and not always equals to NO_ERROR. - cancelRequest() and flush(): the result of reading last frame number should be put in resFrameNumber, not in res. Change-Id: Ic81c58f4ac14c05b3db4bdc5c99f48d00665d3fc Signed-off-by: John Lin <jolin@mozilla.com>
* | am ffa3e71e: am bc0f452b: Merge "Camera2: Fix CameraParameters parse ↵Ruben Brunk2014-11-211-0/+5
|\ \ | | | | | | | | | | | | | | | | | | segfault." into lmp-mr1-dev * commit 'ffa3e71e47215b68fe4ae0b7a3f976db648d63d3': Camera2: Fix CameraParameters parse segfault.
| * \ Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-devRuben Brunk2014-11-211-0/+5
| |\ \
| | * | Camera2: Fix CameraParameters parse segfault.Ruben Brunk2014-11-201-0/+5
| | | | | | | | | | | | | | | | | | | | Bug: 18331142 Change-Id: I41feec93f753f97b3e6bf963deb4a42b73406421
* | | | am c2d88d0b: am f4ea51fd: Merge "camera2: fix an error reading a NULL ↵Chien-Yu Chen2014-11-211-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | string" into lmp-mr1-dev * commit 'c2d88d0b1571c11187e32b94e281ded17606070f': camera2: fix an error reading a NULL string
| * | | camera2: fix an error reading a NULL stringChien-Yu Chen2014-11-201-3/+3
| |/ / | | | | | | | | | | | | | | | | | | Handle the case where the surface name isn't set. Bug: 10461464 Change-Id: I3ee233a7a5f6489513e6d87241cda2aaefbfd43b
* | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-1710-27/+27
|\ \ \ | | |/ | |/| | | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| * | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1710-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | | am 7b28e4e7: am 9527a598: Merge "Camera: Guard against asBinder() calls on ↵Eino-Ville Talvala2014-11-111-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | NULL interfaces" * commit '7b28e4e709fcc90f9ca5ca987e2d4e8c05d1a731': Camera: Guard against asBinder() calls on NULL interfaces
| * | Camera: Guard against asBinder() calls on NULL interfacesEino-Ville Talvala2014-11-071-1/+1
| | | | | | | | | | | | | | | Bug: 18207548 Change-Id: I9879c9b4c0282a6b96b77398f62beedc47f7f0a0
* | | am 0c629a38: camera: fix vendortags section malloc failureGaurav Batra2014-11-031-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | automerge: 8d55aa3 * commit '8d55aa31abe6d3db7693c6a49d9471f06c586c41': camera: fix vendortags section malloc failure
| * camera: fix vendortags section malloc failureGaurav Batra2014-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | size_t type variables should be initialized properly especially on 64-bit archs if they are type casted to shorter datatypes for some operation and then later used in entirety. The results may be unpredictable since the most significant bytes may contain garbage. Bug 18222311 Change-Id: Iced82e964cf8c98f6856d257fc1534a5237a9064
* | am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-122-36/+1
|\ \ | |/ |/| | | | | * commit 'fe80b7ee58b394b0cd958470aeea3c5a09f6b2bf': Clean up test makefiles.
| * Clean up test makefiles.Dan Albert2014-09-112-36/+1
| | | | | | | | | | | | | | | | The build system takes care of linking the correct STL and gtest libraries for you, and specifying them manually confuses the build system when using libc++. Change-Id: I6ac66c2f4e97cd3c55efb7a85e10922420554e7f
* | camera2: Fix CameraUtils orientation for front camera.Ruben Brunk2014-08-211-6/+6
| | | | | | | | | | Bug: 16637957 Change-Id: If6d213794a92eb60b8a333546670ca868b75e5fc
* | camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-08-182-0/+383
| | | | | | | | | | | | | | | | | | | | | | | | | | As a workaround, duplicate CameraParameters into CameraParameters2 to prevent ABI break for some camera HALs that directly link into CameraParameters. CameraParameters2 implements the real fixes needed in the framework, while CameraParameters is left in to satisfy older camera HALs. Bug: 12609188 Bug: 16654949 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
* | Camera2: Fix transforms for front-facing camerasEino-Ville Talvala2014-07-291-4/+11
| | | | | | | | | | | | | | | | | | Mirror, mirror on the wall, who is the best rotated of them all? Also, use consistent enum names. Bug: 16637957 Change-Id: Ie211d3b57b9e7d01122192ad03b73ceba5bf1bd3
* | Camera HAL3: migrate from partial quirks to partial resultZhijun He2014-07-161-0/+2
| | | | | | | | | | | | | | | | | | | | - Enable the normal partial result path for HAL3.2, the quirk is only used for the HAL version lower than HAL3.2. The partial quirks is no longer supported for HAL3.2 or higher versions. - Add CameraDeviceBase getDeviceVersion API. - Fix some build warnings Change-Id: I7a1b03d4d5fd5258d2addfba4368bee2ba691337
* | camera2: Set orientation flags for hardware composer.Ruben Brunk2014-07-142-0/+119
| | | | | | | | | | Bug: 15116722 Change-Id: I3fcc9aea38afcbd665f86c511a9929fe9a6a3a8f
* | cameraservice: Implement HAL1 and higher HAL API coexistenceZhijun He2014-06-192-0/+70
| | | | | | | | | | | | | | A higher hal version device like HAL3.2 can be opened as HAL1.0 device if HAL supports it. This only applies to camera API1. Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
* | camera: Add #getLegacyParameters, #supportsCameraApi to ICameraServiceIgor Murashkin2014-06-171-0/+59
| | | | | | | | Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
* | am dd80baf5: am 1f15b117: Merge "libcamera_client: 64-bit compile issue"Mark Salyzyn2014-06-112-4/+4
|\ \ | |/ | | | | | | * commit 'dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1': libcamera_client: 64-bit compile issue
| * libcamera_client: 64-bit compile issueMark Salyzyn2014-06-092-4/+4
| | | | | | | | | | | | | | - size_t print format - some unused parameter warning messages Change-Id: I2c0f50dda7e810f3f60603fd9d8c62c5b8767528
| * am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS ↵Igor Murashkin2014-03-252-0/+382
| |\ | | | | | | | | | | | | | | | | | | single/range values * commit '0370be96e33ea0c8fb4069e704deccce43b7403c': DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
* | | libcamera_client: 64-bit compile issue (part deux)Mark Salyzyn2014-06-092-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | - %p print warning message - size_t print warning messages - unused parameter warning messages Change-Id: I5de3564b27c65fe1a27c0bcc18ac1b72fca040e2
* | | Merge "cameraservice: Fix ICameraDeviceUser aidl order."Ruben Brunk2014-05-221-23/+23
|\ \ \
| * | | cameraservice: Fix ICameraDeviceUser aidl order.Ruben Brunk2014-05-221-23/+23
| | | | | | | | | | | | | | | | Change-Id: I19eb3d2ff86c0b395b6358e018c677b6e2d45c75
* | | | resolved conflicts for merge of f285c91e to masterElliott Hughes2014-05-221-4/+4
|\ \ \ \ | |/ / / |/| | | | | | | Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65
| * | | am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for ↵Igor Murashkin2014-03-252-0/+382
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Preview FPS single/range values * commit '65550a0e17852fe657795508e3bf05bdbfb2520b': DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
| | * DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-252-0/+382
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a workaround, duplicate CameraParameters into CameraParameters2 to prevent ABI break for some camera HALs that directly link into CameraParameters. CameraParameters2 implements the real fixes needed in the framework, while CameraParameters is left in to satisfy older camera HALs. Bug: 12609188 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
* | | camera2: Update CameraService for HAL1 shim.Ruben Brunk2014-05-213-2/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the camera service to handle shim connections. Changes include: - Adds begin/end configure binder calls. - Adds cache for shim client static camera metadata. - Implements basic getCameraCharacteristic functionality for shim clients. Bug: 15116722 Bug: 15117269 Change-Id: I510c5888ca15f8e7d3b8ed1680ff1c7f8f514744
* | | Camera: Don't enable log spew by default for eng buildZhijun He2014-05-122-8/+4
| | | | | | | | | | | | | | | | | | Also replace assert with LOG_ALWAYS_FATAL_IF. Change-Id: I528b97d9bc7a93dc3575ded28f6bf7e294d0a1e6
* | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-022-13/+156
| | | | | | | | | | | | | | | Bug: 12134423 Change-Id: I97dc955ee9dd78ace93a7946296d6d9b0e407d43
* | | Revert "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-032-155/+12
| | | | | | | | | | | | | | | | | | This reverts commit 4764324d2704f1b08bb7407014bf203924ff2363. Change-Id: I86d7fcc11423502b73fab2a82af6aa89804f0b76
* | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-022-12/+155
| | | | | | | | | | | | | | | Bug: 12134423 Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e