summaryrefslogtreecommitdiffstats
path: root/camera
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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
* 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
* 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
* | | 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