summaryrefslogtreecommitdiffstats
path: root/include/camera
Commit message (Collapse)AuthorAgeFilesLines
* CameraBase: Don't return an sp<> by referenceEino-Ville Talvala2017-04-051-1/+1
| | | | | | | | | | | | | | | If the server dies, the binder death callback clears out the global camera service sp<>, and any current references to it will become quite unhappy. Test: Camera CTS passes Bug: 31992879 AOSP-Change-Id: I2966bed35d0319e3f26e3d4b1b8dc08006a22348 CVE-2017-0544 Change-Id: Ib7ef455366927b0471f8fcabdd5a54e38e375d41 (cherry picked from commit 4b49489c12e6862e9a320ebcb53872e809ed20ec)
* Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-021-0/+6
|\ | | | | | | | | | | Android 6.0.1 Release 61 (MOB30Z) Change-Id: Ic86e42d5fb8f81fe5c4f58d2e76852829c609760
| * DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleakEino-Ville Talvala2016-06-231-0/+6
| | | | | | | | | | | | | | | | Subtract address of a random static object from pointers being routed through app process. Bug: 28466701 Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-052-2/+20
|\ \ | |/ | | | | | | | | Android 6.0.0 release 26 Change-Id: I8a57007bf6efcd8b95c3cebf5e0444345bdd4cda
| * CameraService: Notify camera service proxy of device statusEino-Ville Talvala2015-08-211-2/+15
| | | | | | | | | | | | | | | | Send the camera proxy service in system server updates to camera device state: opened/closed/active/idle. Bug: 23393557 Change-Id: Id7c70f134821efa34af8f6e7b4caa4c2ab128ebc
| * Merge "Add experimental camera session prepare API." into mnc-dr-devRuben Brunk2015-08-171-0/+5
| |\
| | * Add experimental camera session prepare API.Ruben Brunk2015-08-141-0/+5
| | | | | | | | | | | | | | | Bug: 18949148 Change-Id: I8f73e68ea2e3acc60d98954106f364d13f439a82
* | | Camera: Add support for manual 3A.Peng Zhu2015-10-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add manual white balance mode. user can set the specific cct to lock the white balance.Just as other white balance mode, it will lock the white balance once it's set, the only difference it that the cct value is set from app. Add manual focus mode allow app to set the focus distance with DAC value or actuator step value. Once the value is set, the focus distance is locked unless app switch it back to automatically mode Change-Id: I0c08ad0cea27284645e9e710c26844ca24a5c477
* | | camera: allow device to append camera parametersKonsta2015-10-142-0/+40
|/ / | | | | | | | | | | | | Overload using include/camera/CameraParametersExtra.h in device tree to add device specific camera parameters. Change-Id: Ie79380f4e49661348df4b2028ddf48daa67fca2d
* | Camera: Add camera type to ICameraService.getNumberOfCameras.Eino-Ville Talvala2015-08-141-0/+10
|/ | | | | | | | | Also determine the number of 'normal' cameras present on camera service startup, and ensure that all normal cameras have IDs lower than the 'strange' cameras. Bug: 23194168 Change-Id: I1f7b14825cb52707de698a955f85da1eaa932663
* Camera: Add hidden experimental tearDown method.Eino-Ville Talvala2015-07-161-0/+6
| | | | | Bug: 18949148 Change-Id: Ie86ec7d1ec3db54e1154563b2339a208a935f849
* camera2: Fix native binder interface and add tests.Ruben Brunk2015-07-061-0/+2
| | | | | | | | | - Add CameraBinderTests for limited coverage of native camera2 binder interfaces for the camera service. - Fix several bugs in the native binder interfaces. Bug: 18468810 Change-Id: Iab2d81a5cacd20daf7454aeeed033cc13d88452c
* Camera2: implement high speed video APIsZhijun He2015-06-031-1/+1
| | | | | Bug: 21442271 Change-Id: Ia0ae5bbd3e8c81bad293c29987301a2457817d12
* camera: Add AIDL interface for CameraServiceProxy.Ruben Brunk2015-05-201-0/+52
| | | | | | | | | | | | | - Adds an AIDL interface to allow the proxy camera service running in system server to accept RPCs from the camera service running in mediaserver. - Request an update to the valid user set from the proxy camera service when mediaserver restarts to initialize properly + avoid DOS after a crash. Bug: 21267484 Change-Id: Ib821582794ddd1e3574b5dc6c79f7cb197b57f10
* camera2: Fix work-profile eviction handling.Ruben Brunk2015-05-141-1/+1
| | | | | Bug: 20124384 Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
* Revert "Add camera app op - camera"Svetoslav Ganov2015-05-122-5/+5
| | | | | | | | This is not needed duplication of work This reverts commit 32fa6d0e65dbf956e253a1006e9419dce2fe75c9. Change-Id: I2c81b0dacb2ed99c408c79c1f9e22a4baa564494
* Add camera app op - cameraSvet Ganov2015-05-022-5/+5
| | | | Change-Id: I26570cc0a23fdea740b416a26838d40cac296c85
* Camera2: Add prepare for output streamsEino-Ville Talvala2015-04-152-0/+8
| | | | | | | | | 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/+14
| | | | | | | 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-1/+18
| | | | | Bug: 19186859 Change-Id: I172a2ce46c8e8a131ae7e8dd99d60c5f4f0d6668
* Merge "Camera: fix metadata assertion"Yin-Chia Yeh2015-03-251-2/+2
|\
| * Camera: fix metadata assertionYin-Chia Yeh2015-03-241-2/+2
| | | | | | | | | | Bug: 19897963 Change-Id: I6b383c4750f31691a1c02e927bbeb0c1998a9eff
* | camera2: Remove ProCamera.Ruben Brunk2015-03-204-500/+0
|/ | | | | Bug: 19186859 Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
* Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-192-3/+54
|\
| * Camera: plumbing rotation field throughYin-Chia Yeh2015-03-182-3/+54
| | | | | | | | Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
* | Merge "camera2: Add camera client eviction enforcement."Ruben Brunk2015-03-191-0/+3
|\ \ | |/ |/|
| * camera2: Add camera client eviction enforcement.Ruben Brunk2015-03-181-0/+3
| | | | | | | | | | | | | | | | | | - 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-1/+0
|/ | | | | | | - Remove unused arguments from ICameraDeviceUser::createStream - Add dataSpace as a stream parameter, plumb it through everything Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb
* camera: fix flashlight implementation for HAL v2Chien-Yu Chen2015-03-032-9/+20
| | | | | | | | | | | | | | | | | | Update torch availability when the camera device availability changes. For device HAL v2 and v3 implementation, notify torch unavailable for all camera devices with a flash unit when a camera device is opened. Notify torch available for all camera devices with flash unit when all camera devices are closed. Don't invoke torch status callback in camera service. Invoke torch status callback in HAL or FlashControlBase implementations to avoid race condition. Clean up previous CL. Bug: 2682206 Change-Id: I24f5478f467b2c680565fe98f112eef33e2547a1
* camera: implement flashlight controlChien-Yu Chen2015-02-122-0/+31
| | | | | | | | 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
* Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-041-1/+1
| | | | | | | | Passes the BufferItem for the queued buffer to the onFrameAvailable callback so the consumer can track the BufferQueue's contents. Bug: 18111837 Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
* CameraService: Correct API2 error handlingEino-Ville Talvala2014-08-271-1/+5
| | | | | | | | | | | | | | - Add more error codes to the binder camera2 callbacks - Translate HAL errors to callback errors - When flushing, report failures for queued requests - Treat stream config failure as nonfatal - Send request errors when buffers aren't available for captures Bug: 15524101 Bug: 14448494 Bug: 11272459 Bug: 17160301 Change-Id: I81aa54e805a9cce1cb8a6a9374549daa7666deb2
* camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-08-181-0/+203
| | | | | | | | | | | | | 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
* Camera HAL3: migrate from partial quirks to partial resultZhijun He2014-07-161-1/+7
| | | | | | | | | | - 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-141-0/+49
| | | | | Bug: 15116722 Change-Id: I3fcc9aea38afcbd665f86c511a9929fe9a6a3a8f
* cameraservice: Implement HAL1 and higher HAL API coexistenceZhijun He2014-06-192-0/+21
| | | | | | | 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/+20
| | | | Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
* camera2: Update CameraService for HAL1 shim.Ruben Brunk2014-05-212-0/+34
| | | | | | | | | | | | | | 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
* camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+22
| | | | | Bug: 12134423 Change-Id: I97dc955ee9dd78ace93a7946296d6d9b0e407d43
* Revert "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-031-22/+1
| | | | | | This reverts commit 4764324d2704f1b08bb7407014bf203924ff2363. Change-Id: I86d7fcc11423502b73fab2a82af6aa89804f0b76
* camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+22
| | | | | Bug: 12134423 Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e
* CameraService: fix race condition and wrong last frame number.Jianing Wei2014-04-171-0/+4
| | | | Change-Id: Ie2be9a77a0b074497615de38cbb8e8f13b4858ec
* CameraService: trigger appropriate callbacks for burst capture.Jianing Wei2014-04-103-8/+132
| | | | | | | | | | | | | | | | | | | | * Instead of tracking CameraMetadata only, now we track both CameraMetadata and CaptureResultExtras, which is not part of the HAL metadata. This will enable the correct callback of onCaptureStarted and onResultReceived given burst requests. * Get last frame number in reply when submitting requests, canceling requests, and flushing device. For repeating requests, this frame number is the last frame number of the previous request. For non-repeating requests, this frame number is the expected last frame number of the current request. The goal is provide frame number to Java side in order to trigger onCaptureSequenceCompleted correctly. * Fix notifyError so that onDeviceError can be called correctly. Bug: 10749500 Change-Id: I2f3dda6c530090055d4a2ff9f0f087bbbe8d9257
* Revert "camera: Fix setParameters for Preview FPS single/range values"Eino-Ville Talvala2014-03-261-103/+1
| | | | | | | | Causes a regression on some devices, so reverting until we're in a position to fix those devices. This reverts commit 9078a1b3b9f9c0c48046ade0e8e18b0d79a659db. Bug: 13563098 Change-Id: I7aedd01fde8b8fdee77e972ec395f0ecadbf8ccb
* camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-201-1/+103
| | | | | Bug: 12609188 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4db
* camera2: Don't log vendor tag errors when camera HAL too oldIgor Murashkin2014-03-172-5/+11
| | | | Change-Id: Iac3d23284230c95c85ee404abbf9b22df1ae721c
* camera3: Pass vendor tags through binder.Ruben Brunk2014-03-132-0/+126
| | | | | | | | | | Bug: 12134423 - Adds a class for parceling vendor tag definitions. - Passes vendor tag definitions to clients of the camera service. - Switches over to new vendor tag mechanism when reading from HAL. Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
* Camera HAL3/API1: Add support for the partial result quirk.Eino-Ville Talvala2013-11-061-0/+5
| | | | | | | | | | | | | | | | | | - Camera2Client: - Detect partial result quirk - Camera3Device: - Accumulate all partial results together - Fire off 3A-only result once all 3A states are available - FrameProcessorBase: - Filter out partials, don't send to listeners - FrameProcessor: - Skip face detect on partials - Make sure to only handle a 3A update for a given frame once - Trigger AF notifications when AF mode or trigger changes, to properly detect all AF transitions. Bug: 11115603 Change-Id: Iea8aa73c568701562a46071f7ea100624251d10b
* Camera API 2, Device 2/3: Implement idle and shutter callbacksEino-Ville Talvala2013-10-023-6/+20
| | | | | | | | | | | | | | | | | | - Update callback Binder interface - Rename frameId to be requestId to be consistent and disambiguate from frameNumber. - Implement shutter callback from HAL2/3 notify() - Add in-flight tracking to HAL2 - Add requestId to in-flight tracking - Report requestId from shutter callback - Implement idle callback from HAL3 process_capture_result - Add new idle tracker thread - Update all idle waiting to use the tracker - Add reporting from request thread, all streams to tracker - Remove existing idle waiting infrastructure Bug: 10549462 Change-Id: I867bfc248e3848c50e71527e3561fe92dc037958
* Camera: Implement getCameraCharacteristicsZhijun He2013-09-251-0/+5
| | | | | | Bug: 10904541 Bug: 10360518 Change-Id: Ie9ca6b3b0b5f2fe529e6b0decc193096e770a017