summaryrefslogtreecommitdiffstats
path: root/camera
Commit message (Collapse)AuthorAgeFilesLines
...
* | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-022-12/+155
| | | | | | | | | | | | | | | Bug: 12134423 Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e
* | | CameraService: trigger appropriate callbacks for burst capture.Jianing Wei2014-04-104-24/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | CameraMetadata: Fix String tag update null character issueZhijun He2014-03-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | String8.size() doesn't count the null character in whatever case. But camera metadata tag android.jpeg.gpsProcessingMethod need a null-terminited string. Bug: 13679912 Change-Id: I91e742702b16b9ab9b42f9822de189a9a96e8e53
* | | Revert "camera: Fix setParameters for Preview FPS single/range values"Eino-Ville Talvala2014-03-261-48/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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-5/+48
| | | | | | | | | | | | | | | Bug: 12609188 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4db
* | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-181-3/+6
|\ \ \
| * | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-3/+6
| | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: Ifc8f778b70102a38a9f7a086632e6884714e6b58
* | | | camera2: Don't log vendor tag errors when camera HAL too oldIgor Murashkin2014-03-172-5/+5
| | | | | | | | | | | | | | | | Change-Id: Iac3d23284230c95c85ee404abbf9b22df1ae721c
* | | | camera3: Pass vendor tags through binder.Ruben Brunk2014-03-135-0/+592
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-111-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-111-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | CameraMetadata: fix metadata alignment issueZhijun He2013-12-091-30/+107
|/ | | | | | | | | | | When camera metadata is passed through binder interface, there is no guarantee the destination address of the metadata copy is aligned to the alignment boundary required by metadata copy, which could cause metadata validation fail. this change aligns the start address of the metadata copy destination blob to address this issue. Bug: 12010193 Change-Id: I540c6b4c484fe87a1d625a362310f33a309c1772
* Camera HAL3/API1: Add support for the partial result quirk.Eino-Ville Talvala2013-11-061-1/+9
| | | | | | | | | | | | | | | | | | - 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-024-27/+60
| | | | | | | | | | | | | | | | | | - 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/+36
| | | | | | Bug: 10904541 Bug: 10360518 Change-Id: Ie9ca6b3b0b5f2fe529e6b0decc193096e770a017
* Camera: Correct stream id typesZhijun He2013-09-081-14/+12
| | | | | Bug: 10604704 Change-Id: I223ac5d200eb6439c08955fb7ad586592099fbae
* Merge "Camera2: Add flush support" into klp-devEino-Ville Talvala2013-08-271-0/+17
|\
| * Camera2: Add flush supportEino-Ville Talvala2013-08-231-0/+17
| | | | | | | | | | | | | | | | - On HAL2 devices, fall back to wait until idle - On HAL3 devices, call HAL flush method Bug: 9758581 Change-Id: Ie1c570a15f6590a1ee6c271e3b989c48079b468a
* | camera2: Get rid of annoying "Reading a NULL string...." error messageIgor Murashkin2013-08-231-1/+14
|/ | | | | Bug: 10461464 Change-Id: Ie99f025db0e0e12c703f2d391e218b49330ee4dd
* Camera1: Rename setPreviewTexture to ...Target for clarityEino-Ville Talvala2013-08-211-3/+3
| | | | | Bug: 10312644 Change-Id: I19976188f0359bfd177209fb40145defdae9c740
* Camera1: Set preview to be asynchronous, and remove dead codeEino-Ville Talvala2013-08-212-11/+11
| | | | | | | | | | | | | - Use the controlledByApp flag to make sure application-bound preview buffer queue is asynchronous as before - Remove setPreviewDisplay in service, since it is no longer in the binder interface - Rename setPreviewTexture to setPreviewTarget, to make it clear it's the only game in town now. Rename only on the binder level and service for now. Bug: 10312644 Change-Id: Icd33a462022f9729a63dc65c69b755cb7969857e
* Refactor CameraService to handle errors properly.Ruben Brunk2013-08-164-25/+74
| | | | | | | | Bug: 10361136 -Connect calls now return status_t error flags. Change-Id: Idca453b111e5df31327f6c99ebe853bb2e332b95
* separte producer and consumer interfacesMathias Agopian2013-08-061-2/+1
| | | | | Bug: 9265647 Change-Id: Iefabc11e4bd2e2e8ffd31160476c450affe6629c
* Camera: fix the metadate parcel write issueZhijun He2013-07-311-5/+10
| | | | | | Also rename the frameId to requestId to make it less confusing. Change-Id: I14a20b6fcabb86294afb31fc0c56397e185c1373
* Camera: Rename new API to camera2, rearrange camera serviceEino-Ville Talvala2013-07-305-13/+12
| | | | | | | | | | | - Support API rename from photography to camera2 - Reorganize camera service files - API support files to api1/, api2/, api_pro/ - HAL device support files into device{1,2,3}/ - Common files into common/ - Camera service remains at top-level Change-Id: Ie474c12536f543832fba0a2dc936ac4fd39fe6a9
* camera2: Implement ICameraDeviceUser::waitUntilIdleZhijun He2013-07-231-0/+16
| | | | | | Also fixed some logging typo Change-Id: Ib254bdb137dca10b12595c23aeb1c53097423425
* update to new Consumer APIsMathias Agopian2013-07-161-1/+1
| | | | Change-Id: I3c5d4be2a2e8783fbf98b3e268fd02658f71dc7d
* Merge "always pass the BufferQueue explicitely to consumers"Mathias Agopian2013-07-161-1/+2
|\
| * always pass the BufferQueue explicitely to consumersMathias Agopian2013-07-121-1/+2
| | | | | | | | Change-Id: Ic2d9a9cf184a482b3c78a481ed693ee32df5ca13
* | camera2: Implement ICameraDeviceUser::getCameraInfoIgor Murashkin2013-07-151-14/+13
|/ | | | | Bug: 9529161 Change-Id: I927e39c124cd5fb19e38423506f4463acc381cb0
* am 8ebdfa8b: am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set"Jean-Baptiste Queru2013-07-081-1/+1
|\ | | | | | | | | * commit '8ebdfa8b021ed338f9916a1f30d756b989afa3bd': Typo in CameraParameters::set
| * am 365ed394: Merge "Typo in CameraParameters::set"Jean-Baptiste Queru2013-07-081-1/+1
| |\ | | | | | | | | | | | | * commit '365ed394c4135d9d42082c85638c076aed4bd156': Typo in CameraParameters::set
| | * Typo in CameraParameters::setYou Kim2012-12-141-1/+1
| | | | | | | | | | | | | | | | | | Typo: 'key' --> 'value' Change-Id: Idd0426263cf2125a796406abaf6f29f04f425fe4
| | * DO NOT MERGE: Remove experimental parameters for burst modeJames Painter2012-09-281-5/+0
| | | | | | | | | | | | | | | Bug: 7248756 Change-Id: I3aaf2da4791b2a13e1e788b2914e4c51c529a75d
| * | camera: Use new camera_metadata structure validation functionsIgor Murashkin2013-05-022-15/+63
| | | | | | | | | | | | | | | | | | | | | | | | * Reject unvalidated metadata across binder boundaries * Sanity check in-process CameraMetadata when mutating data Bug: 8713951 Change-Id: I121d8e15f8fdc9cdbbaf27dfd947813e11831e1c
| * | Fix ProCameraTests to pass on Wolfie, disabling failing testsIgor Murashkin2013-04-181-24/+64
| | | | | | | | | | | | | | | | | | | | | | | | Note: tests fail in racy conditions, but we don't occur those conditions in practice in other consumers of ProCamera. Bug: 8654735 Change-Id: Ic73395ad564031a6b30ad99762dee59f9c35cecf
| * | Merge "Update the test output path." into jb-mr2-devYu Shan Emily Lau2013-04-151-1/+1
| |\ \
| | * | Update the test output path.Yu Shan Emily Lau2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for the automated test to pick up the test. The output must be in /data/nativetest. Change-Id: Idc15036afb5617ac1ef67ff74ba332c5f73fe155
| * | | Add liblogYing Wang2013-04-091-0/+1
| |/ / | | | | | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
| * | Camera: Add input side to camera3 HAL deviceEino-Ville Talvala2013-03-271-12/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Stream creation/deletion - Request submission - Request thread loop - Add get() to CameraMetadata to allow HAL submission while retaining ownership. Change-Id: I271f72bcbe9557eded43cbcbfe789109857f8144
| * | Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-devIgor Murashkin2013-03-271-5/+13
| |\ \
| | * | Camera: Add hotplug support (for fixed # of cameras)Igor Murashkin2013-03-261-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Minor: also change addListener to fire the current status upon subscription * Minor: STATUS_AVAILABLE is now an alias for STATUS_PRESENT and deprecated Change-Id: I254608a7332095e3ef201ffea64cff156cfc1b3e
| * | | ProCamera: Fix memory leak in consumeFrameMetadataIgor Murashkin2013-03-272-4/+5
| |/ / | | | | | | | | | | | | Bug: 8402301 Change-Id: I975990185f45bb8552712271b9ac457af08a170c
| * | ProCameraTests: Minor add grey/frame count debug-only print outsIgor Murashkin2013-03-181-0/+10
| | | | | | | | | | | | Change-Id: I0f7b7f3c083a644e9bb0c2302244a5ad434e96a8
| * | remove uses of Surface in favor or IGraphicBufferProducerMathias Agopian2013-03-122-39/+2
| | | | | | | | | | | | Change-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57
| * | (Camera)ProCamera: Remove unused functions from binder interfaceIgor Murashkin2013-03-116-145/+31
| | | | | | | | | | | | Change-Id: I0582268cef6e84b630bc87c8a03dcd69d54c440d
| * | ProCamera: Add CpuConsumer asynchronous mode supportIgor Murashkin2013-02-282-3/+74
| | | | | | | | | | | | | | | | | | Bug: 8290146 Bug: 8291751 Change-Id: I25423a2b8a70ac7169911b1c7b482aa17190fe0f
| * | Camera: Drop ProCamera connections when a Camera connection happensIgor Murashkin2013-02-285-12/+274
| | | | | | | | | | | | | | | | | | | | | * Also adds an ICameraServiceListener with available/not available statuses Bug: 8291653 Change-Id: I24680f1a2dc109510caf451cf7c7bd180b670d84
| * | ProCameraTest: Drop frames test move processing delay between lock/unlockIgor Murashkin2013-02-281-5/+5
| | | | | | | | | | | | | | | | | | | | | * This makes it more likely to find races with the buffer being unlocked by itself Change-Id: I1fa7dbfb73f60664a02a35678b58bcc9b06893a2
| * | camera_client: refactor Camera/ProCamera commonalities into BasicCameraIgor Murashkin2013-02-265-249/+283
| | | | | | | | | | | | Change-Id: Ie10a4094522d49683657665fe94ab0b7ccd280e9