summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* am 5c679d41: resolved conflicts for merge of 3d7c5002 to ↵Colin Cross2014-03-241-1/+0
|\ | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '5c679d41714e42f153f6aeb492df54510a195bc1': libcameraservice: build 64-bit libcameraservice: fix 64-bit print format warnings
| * libcameraservice: build 64-bitColin Cross2014-03-211-1/+0
| | | | | | | | | | | | libcameraservice builds fine for 64-bit, remove LOCAL_32_BIT_ONLY Change-Id: I9f28bc42dc424dee9b92e6ab092f86d3aa1419b7
* | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-141-0/+1
|\ \ | |/ | | | | Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
| * mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+1
| | | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
* | camera3: Pass vendor tags through binder.Ruben Brunk2014-03-131-0/+15
|/ | | | | | | | | | 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: Collect stack traces when bad things happen, print with dumpsysIgor Murashkin2013-10-291-0/+1
| | | | | Bug: 11324229 Change-Id: Ic920e170a8f5a389fc139bbf5416c0e3186c7fb6
* Camera API 2, Device 2/3: Implement idle and shutter callbacksEino-Ville Talvala2013-10-021-0/+1
| | | | | | | | | | | | | | | | | | - 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: Rename new API to camera2, rearrange camera serviceEino-Ville Talvala2013-07-301-24/+24
| | | | | | | | | | | - 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
* Make android.hardware.photography.Camera work on HAL3+ devicesIgor Murashkin2013-06-201-0/+1
| | | | | Bug: 9213377 Change-Id: I5b2eeab28985f53dfcb7b8e3029930f5adcd74f5
* Initial implementation of android.hardware.photography.CameraDevice (service)Igor Murashkin2013-06-201-0/+1
| | | | | | | | | | | * 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
* Camera3: Refactor stream code to be DRYIgor Murashkin2013-05-101-0/+1
| | | | | Bug: 8851039 Change-Id: Iaac2926bfa25dd6e9db8b307765d4fe709b88d21
* Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-devIgor Murashkin2013-05-011-1/+3
|\ | | | | | | | | | | | | * changes: Camera3: Add ZSL stream support camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames Camera3: Add input stream support
| * Camera3: Add ZSL stream supportIgor Murashkin2013-04-291-0/+1
| | | | | | | | | | | | Bug: 8563838 Change-Id: I2feda142ff5172aba17ade5c8d502f9bb5d5b766
| * camera: Add new RingBufferConsumer to keep a ring buffer of acquired framesIgor Murashkin2013-04-291-1/+2
| | | | | | | | | | Bug: 8563838 Change-Id: I5a95e0be94e5388b30639905efae42d3c3279f72
* | Add liblogYing Wang2013-04-091-0/+1
|/ | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* Camera: Add streams to camera3 HAL deviceEino-Ville Talvala2013-03-271-0/+4
| | | | | | | | - Generic stream interface - Functional output stream - Skeleton input/zsl stream Change-Id: I143794eac1a2217031d62b51912662fc6d1db900
* CameraService: Refactor Camera2Client to share a base with ProCameraClientIgor Murashkin2013-03-111-0/+1
| | | | Change-Id: I249e2a0fc47ae84f29c9d9c4a223fba13da3ee66
* Camera: Start of support for version 3.0 of camera device HALEino-Ville Talvala2013-02-271-0/+2
| | | | | | | - Refactor common CameraDevice interface out of Camera2Device - Initial skeleton only for Camera3Device Change-Id: I097cc76e2ad102a51712ac114235163245f5482c
* Camera: ProCamera - implement onResultReceived callback for metadata callbacksIgor Murashkin2013-02-221-1/+2
| | | | Change-Id: I46775402b007244bc383d6343a620eebbd492aad
* Camera: ProCamera2Client - add createStream (service is stubbed) and unit testIgor Murashkin2013-02-221-0/+1
| | | | Change-Id: I1ae7ba9b24f5883c214c19a7ed0eaf0c802d69c1
* Camera: Move CameraMetadata.h from service to client libraryIgor Murashkin2013-02-221-1/+0
| | | | Change-Id: I940ce86f318f37ae5b73f912a6e589415150125f
* Remove obsolete references to libmedia_nativeGlenn Kasten2012-10-301-1/+0
| | | | | Bug: 6654403 Change-Id: I3993d62987cf0dd85db10bf002a5cce53d4f01bd
* Camera2: Compile with warnings, fix warningsIgor Murashkin2012-10-261-0/+3
| | | | Change-Id: I557350abb32b0480f5da7dcecadfbe9edbe53361
* Camera2: Refactor preview/recording management to separate class.Eino-Ville Talvala2012-09-281-0/+1
| | | | | | | | | | | Untangle preview/recording management from main class to simplify callpaths; in preparation for fixing several HAL/app interactions bugs. Bug: 7172543 Bug: 7159577 Bug: 7107220 Change-Id: Iab5503f66b35d88a1524111536a484c9e33fd934
* Camera2: Add a burst mode skeleton.James Painter2012-09-071-3/+7
| | | | | Bug: 6243944 Change-Id: I7f496ca1051571c68fdd99a6f85bf6a908a4e29a
* Camera2: Basic ZSL and precapture trigger support.Eino-Ville Talvala2012-09-061-2/+4
| | | | | | | | | | | | | | | | | - Add capture sequencer to control still image capture process - Use precapture trigger for standard capture in sequencer - Add infrastructure for reprocessing streams - Add ZSL processor to maintain ZSL queue - Add ZSL capture sequence to sequencer This patch sets up ZSL mode and precapture triggers. For now, to enable zsl mode, set the system property camera.zsl_mode to 1. Bug: 6243944 Change-Id: Icf8cb1a83a7c11a152a11007c8f3c54f8ea1c70c
* Camera2: Move preview callback processing to its own thread.Eino-Ville Talvala2012-08-301-1/+2
| | | | | | | | To reduce delays for HAL callbacks, manage preview callbacks in their own thread. Bug: 6243944 Change-Id: I7bef56949ac889ffce4e031bf40291a771a46f3e
* Camera2: Move still capture processing to separate thread.Eino-Ville Talvala2012-08-301-1/+2
| | | | | | | | | To avoid stalling HAL when it queues up new buffers for still capture, process still captures in a separate thread. Also move Camera2Heap to its own class so it can be used by the CaptureProcessor. Bug: 6243944 Change-Id: Id38e2a52367c0985812fcd4fd9af3ef90beef43f
* Camera2: Factor out FrameProcessor.Eino-Ville Talvala2012-08-281-1/+2
| | | | | | | | Move FrameProcessor to its own file, add necessary interfaces to Camera2Client. Bug: 6243944 Change-Id: I8d1b8280a65d2822461ebe6b6c9de17992b34276
* Camera2: Factor out Camera2Client::ParametersEino-Ville Talvala2012-08-281-1/+2
| | | | | | | | | | | | | Move the parameter structure and the various utility methods using it to its own class. Rename LockedParameters to SharedParameters to match the Mutex naming convention. Also move CameraMetadata to camera2 directory for organization. No functional changes. Bug: 6243944 Change-Id: Ie60b535936ecfda9bf23361d52604abf515c83d0
* Camera2: Use CameraMetadata wrapper class.Eino-Ville Talvala2012-08-271-1/+2
| | | | | | | | | Wrap the use of the camera_metadata library inside a CameraMetadata class to avoid memory leaks, improve code clarity, and increase type safety. Bug: 6243944 Change-Id: I90ca592b5875e27e4c58ea1ca680582dc3c3b56a
* Camera2: Replace MediaConsumer with BufferItemConsumer.Eino-Ville Talvala2012-08-211-2/+1
| | | | | | | | Get rid of MediaConsumer, which was largely duplicated code, and replace it with the simpler BufferItemConsumer. Bug: 6243944 Change-Id: I242d80c5fe39f2ee581ec8bb46f362997d994b0a
* Camera2: Revamp recording support to allow opaque formats.Eino-Ville Talvala2012-07-241-1/+2
| | | | | | | | - Avoid memcpy of buffer data by using metadata mode - Temporarily add MediaConsumer BufferQueue class Bug: 6243944 Change-Id: I7a8c4222b7dbd14f1b1d86fda06d38eb640e87c1
* Update ANativeWindow client code for syncJamie Gennis2012-06-211-0/+1
| | | | | | | This change updates all the uses of ANativeWindow to use the new ANW functions that accept and return Sync HAL fence file descriptors. Change-Id: Id7db42d8d6380f8b440d88476ce9211c6225fb16
* Camera service: Initialization for camera2 clients and devicesEino-Ville Talvala2012-05-291-1/+2
| | | | | | | | | | | - Refactor initialization code to hide device type from CameraService - Add metadata queue class to Camera2Device - Initialization of Camera2Device, Camera2Client - Conversion from HAL2 device static metadata to camera API parameters. Bug: 6243944 Change-Id: I524145b45438e906d8493dae202704ce8f090aeb
* Camera service: Add skeleton support for camera2 devices.Eino-Ville Talvala2012-05-171-1/+6
| | | | | | | | | | | | - Add Camera2Client, which maps the current android.hardware.Camera API to the new camera2 semantics - Add Camera2Device, a C++ wrapper for the HAL camera 2 device No functionality besides create/destroy; all client methods return error or null. Bug: 6243944 Change-Id: I6bd5136fa1efd8279b8cd2d9847d9b0bb2862294
* Break out CameraClient from CameraService.Eino-Ville Talvala2012-05-161-1/+2
| | | | | | | | | | | | | | To allow for different low-level implementations of the current camera API, the Client class inside CameraService has to be inheritable. This change breaks it up into the common section accessed by the camera service, and the full implementation for camera device HAL version 1. The full implementation is moved out to CameraClient.h/.cpp. There are no functionality changes, just code reorganization. Bug: 6243944 Change-Id: I8a79b31a3ae3617198dc6bb5576a9f2e2d9c95de
* Add libmedia_nativeGlenn Kasten2012-03-161-0/+1
| | | | Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
* frameworks/base: switch CameraService to a HAL moduleIliyan Malchev2011-05-031-44/+2
| | | | | | | | | | | | | | | This patch changes CameraService to load a camera HAL module, instead of linking directly against a library that implements the CameraHardwareInterface class. CameraHardwareInterface no longer defines the API to the camera HAL. Instead, this is now in HAL header hardware/camera.h. We keep CamerHardwareInterface as a class local to CameraService, which wraps around the new HAL calls. In the future, we may remove this class entirely and have CameraService call the HAL methods directly. Change-Id: I5c61ac40078fc0b50bbac5881a556fe6c8837641 Signed-off-by: Iliyan Malchev <malchev@google.com>
* merge libsurfaceflinger_client into libguiMathias Agopian2011-03-251-1/+0
| | | | | | | | | | | | this is the first step in unifying surfacetexture and surface. for this reason the header files were not moved, as most of them will eventually go away. NOTE: currently we keep libsurfaceflinger_client.so as an empty library to workaround prebuilt binaries wrongly linking against it. Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
* Add camera service support for SurfaceTexture.Jamie Gennis2011-01-061-1/+2
| | | | | | | This change enables the use of a SurfaceTexture in place of a Surface as the destination of camera preview frames. Change-Id: Ic70d404c8fe261e9d5da6f1de93d6babb5b191cb
* move native services under services/Mathias Agopian2010-07-141-0/+66
moved surfaceflinger, audioflinger, cameraservice all native services should now reside in this location. Change-Id: Iee42b83dd2a94c3bf5107ab0895fe2dfcd5337a8