summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/CameraService.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-051-1/+14
|\
| * camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+14
| | | | | | | | | | Bug: 12134423 Change-Id: I97dc955ee9dd78ace93a7946296d6d9b0e407d43
| * Revert "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-031-14/+1
| | | | | | | | | | | | This reverts commit 4764324d2704f1b08bb7407014bf203924ff2363. Change-Id: I86d7fcc11423502b73fab2a82af6aa89804f0b76
| * camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+14
| | | | | | | | | | Bug: 12134423 Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e
* | NULL check in ConnectProNatalie Silvanovich2014-05-051-0/+5
|/ | | | | | | Prevents service crash Bug: 13744720 Change-Id: I7a5cdba830b4f96660f890ede6b94c38fc3108dd
* CameraService: trigger appropriate callbacks for burst capture.Jianing Wei2014-04-101-3/+6
| | | | | | | | | | | | | | | | | | | | * 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
* Camera3: fix HAL3.x version check issueZhijun He2014-03-271-0/+8
| | | | | | Camera service should support HAL3.x instead of only HAL3.0. Bug: 13609405 Change-Id: If7e86f9abe019547fc0be2e11337551cd7c57870
* am a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
|\ | | | | | | | | * commit 'a1aaaf86cd04eabaf961a30d7b0a9fa857089862': CameraService: deadlock fix
| * am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| |\ | | | | | | | | | | | | * commit '4f53fe74051026e6635ba5bdbed4f1898cb66028': CameraService: deadlock fix
| | * CameraService: deadlock fixKalle Lampila2014-03-251-0/+1
| | | | | | | | | | | | | | | | | | | | | Release lock before return from CameraService::dump() Change-Id: Ia20b0921fc675a284f3b7f8d26e0e3596b5a8774 Signed-off-by: Kalle Lampila <kallex.lampila@intel.com>
* | | am 5c679d41: resolved conflicts for merge of 3d7c5002 to ↵Colin Cross2014-03-241-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '5c679d41714e42f153f6aeb492df54510a195bc1': libcameraservice: build 64-bit libcameraservice: fix 64-bit print format warnings
| * | resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aospColin Cross2014-03-211-1/+1
| |\ \ | | |/ | | | | | | Change-Id: Ia6d87d56174d1388c1148fb55b6e4bc57d8666db
| | * libcameraservice: fix 64-bit print format warningsColin Cross2014-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | Use PRId64 from inttypes.h to print nsecs_t (int64_t) Use %zu to print size_t Change-Id: I135620e0388db33587a8a7da393b48a45cb7275a
* | | am 557847ee: am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null ↵Igor Murashkin2014-03-181-0/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | availability listener * commit '557847ee511dd5e75d584ff04449322f0f098241': camera2: Fix segfault when using null availability listener
| * | am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null availability ↵Igor Murashkin2014-03-181-0/+10
| |\ \ | | |/ | |/| | | | | | | | | | | | | listener * commit 'a6ca0acf0d009acf45b05561273aaad44ab22533': camera2: Fix segfault when using null availability listener
| | * camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | ICameraService::addListener / removeListener will now return BAD_VALUE if a null listener is used. Bug: 12891434 Change-Id: I9764110094d8fd42e22fcc8df3ef0e73c1b070e7
* | | camera2: Don't log vendor tag errors when camera HAL too oldIgor Murashkin2014-03-171-1/+1
| | | | | | | | | | | | Change-Id: Iac3d23284230c95c85ee404abbf9b22df1ae721c
* | | camera3: Pass vendor tags through binder.Ruben Brunk2014-03-131-15/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-111-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | 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
* | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-1/+2
|/ | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* camera: Collect stack traces when bad things happen, print with dumpsysIgor Murashkin2013-10-291-0/+5
| | | | | Bug: 11324229 Change-Id: Ic920e170a8f5a389fc139bbf5416c0e3186c7fb6
* Camera: only return static metadata for HAL3 deviceZhijun He2013-10-011-0/+6
| | | | | | | This effectively disables the camera2 APIs for HAL2.x or lower HAL device. Bug: 10360518 Change-Id: I0f374ac533468c6181f5672c75088b7144b9c53d
* Camera: Implement getCameraCharacteristicsZhijun He2013-09-251-0/+37
| | | | | | Bug: 10904541 Bug: 10360518 Change-Id: Ie9ca6b3b0b5f2fe529e6b0decc193096e770a017
* Fix CameraService error flag when running HAL1 with API2.Ruben Brunk2013-09-041-2/+2
| | | | | | Bug: 10620944 Change-Id: I44c0d09a3d313ae8f724fbe61fa5f36cf5b38b6d
* Refactor CameraService to handle errors properly.Ruben Brunk2013-08-161-56/+65
| | | | | | | | Bug: 10361136 -Connect calls now return status_t error flags. Change-Id: Idca453b111e5df31327f6c99ebe853bb2e332b95
* Camera: Rename new API to camera2, rearrange camera serviceEino-Ville Talvala2013-07-301-4/+4
| | | | | | | | | | | - 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
* Camera: ProCamera connect need support HAL3 deviceZhijun He2013-07-221-0/+1
| | | | Change-Id: Iae7e5f9e6387f61f1c4bbb91f75803fc1fdf2668
* Make android.hardware.photography.Camera work on HAL3+ devicesIgor Murashkin2013-06-201-0/+3
| | | | | Bug: 9213377 Change-Id: I5b2eeab28985f53dfcb7b8e3029930f5adcd74f5
* Initial implementation of android.hardware.photography.CameraDevice (service)Igor Murashkin2013-06-201-19/+106
| | | | | | | | | | | * Verified preview streaming requests * Other things *should* work but unverified / unimplemented in client side Missing: * CameraService needs to return static camera info metadata Bug: 9213377 Change-Id: I71568560fcf18d0e2b408ed1c4d0066647314868
* Camera: Hotplug - conditionally transition to PRESENT when clients disconnectIgor Murashkin2013-05-021-7/+30
| | | | | | | | | Fixes an issue where a client could unconditionally transition to PRESENT after a client disconnects, even though the underlying HAL status was actually NOT_PRESENT or ENUMERATING. Bug: 8780114 Change-Id: I68adb5fc819eec3b046ddcb2507b84bedc999a0f
* Camera2: Fix deadlock on shutdown due to client getting killed.Eino-Ville Talvala2013-04-261-0/+4
| | | | | | | | | | | | | | When the binder connection dies and is the only holder of a strong pointer to the Camera2Client, disconnect is called from the destructor. At this point, all weak pointers to Camera2Client are no longer promotable, and lots of cleanup code paths are broken as a result. Rework all such code paths to not need the client pointer, and to discard image buffers that arrive during shutdown. Bug: 8696047 Change-Id: Ic0672ecde7c1baaf65079f925a45bd5be45f1fb3
* Camera: Add hotplug support (for fixed # of cameras)Igor Murashkin2013-03-261-3/+131
| | | | | | | * 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 rare deadlock when client destructs inside the connect callIgor Murashkin2013-03-131-77/+87
| | | | | Bug: 8337737 Change-Id: Ia6fca4365fa20fdbfd6a1ec8d047639a002f2aba
* Camera: Make ProCamera connect take the same paths as Camera connectIgor Murashkin2013-03-111-127/+88
| | | | | | | | * ProCamera uses the app ops manager * Refactored connect calls to be as common as possible * Removed some useless not implemented function calls in ProClient Change-Id: I5dab30d20f0c202a494a07b2cfe4c1fa04a2a076
* CameraService: Refactor Camera2Client to share a base with ProCameraClientIgor Murashkin2013-03-111-6/+8
| | | | Change-Id: I249e2a0fc47ae84f29c9d9c4a223fba13da3ee66
* Camera: Drop ProCamera connections when a Camera connection happensIgor Murashkin2013-02-281-1/+125
| | | | | | | * Also adds an ICameraServiceListener with available/not available statuses Bug: 8291653 Change-Id: I24680f1a2dc109510caf451cf7c7bd180b670d84
* Camera: Start of support for version 3.0 of camera device HALEino-Ville Talvala2013-02-271-1/+3
| | | | | | | - Refactor common CameraDevice interface out of Camera2Device - Initial skeleton only for Camera3Device Change-Id: I097cc76e2ad102a51712ac114235163245f5482c
* camera_client: refactor Camera/ProCamera commonalities into BasicCameraIgor Murashkin2013-02-261-1/+5
| | | | Change-Id: Ie10a4094522d49683657665fe94ab0b7ccd280e9
* CameraService and Stagefright: Support AppOpsEino-Ville Talvala2013-02-251-28/+143
| | | | | | | | | | | | | Camera: - Signal to AppOpsService when camera usage starts and stops - Listen to permissions revocations and act on them - Currently just kill camera connection when permissions lost Stagefright: - Pass on client name, UID to camera as needed Bug: 8181262 Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
* Camera: ProCamera2Client - add createStream (service is stubbed) and unit testIgor Murashkin2013-02-221-1/+3
| | | | Change-Id: I1ae7ba9b24f5883c214c19a7ed0eaf0c802d69c1
* Camera: Add ProCamera private binder interface for an API2-light functionalityIgor Murashkin2013-02-221-29/+267
| | | | Change-Id: I2af7a807c99df75ea659e6e6acc9c4fca6a56274
* Camera: Add unit test infrastructure for libcameraclientIgor Murashkin2013-02-221-0/+1
| | | | Change-Id: I957538663ae8332d26f3640c63a75efc79f4ac5c
* CameraService: Log camera module nameAlex Ray2013-02-201-0/+1
| | | | | | | | Explicitly logs camera module loaded. This is useful on systems with multiple camera modules installed. Also this make the camera service match audioflinger, which logs hardware module names as well. Change-Id: I280bf12df2d517f936916b8ba3cb662e671d0216
* Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-151-1/+0
| | | | Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
* Camera2: Always disconnect in the client destructorIgor Murashkin2012-10-081-0/+4
| | | | | | | | | | | If Camera2Client failed to initialize, it would skip disconnect step, and thus the camera would be forever marked as busy. By always calling disconnect it will always call free. It also adds a new guarantee that Client::disconnect is idempotent Bug: 7298182 Change-Id: Ic9876f1665b7d9b3c0da692880f63f165e3f4fa5
* Camera2: Don't promote weak IBinder ptrs to strong onesIgor Murashkin2012-10-051-10/+12
| | | | | | | | | The Binder driver does not support promoting weak pointers into strong pointers. Occassionally the system would lock up when trying to do this (when closing the camera app). Bug: 7289040 Change-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871
* Camera2: Handle client processes dying by closing camera resourcesIgor Murashkin2012-10-031-15/+77
| | | | | | | | | CameraService now subscribes to binder death notifications for each client, and disconnects the client if the death happened without cleanly shutting down the client first. Bug: 7258314 Change-Id: I7803836b589fd8f0dfe00f6c28a707b82012e751
* Camera2: Improve formatting of debugging dumpEino-Ville Talvala2012-07-311-1/+2
| | | | | Bug: 6243944 Change-Id: Id8730357f3adcd96923132f9f702e296e0dfd357
* CameraService: Add more information to service dump.Eino-Ville Talvala2012-07-171-4/+57
| | | | | | | | | Add dumpsys information even when there's no active client. Including: - Camera module version / name / author - Number of camera devices - Static information for each device Change-Id: Ib97e325f6be5f989b342d24f1ae17aa9e796f8ed
generated by cgit v1.1 at 2024-05-16 11:19:57 +0000