summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | mediaresourcemanager: change resource manager service log to use ring buffer.Ronghua Wu2015-05-112-362/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | move the ring buffer implementation from libcameraservice to media include. also add line prefix support to the service log. Bug: 20637674 Change-Id: Ib6b32f31abe92c42644ef7012f1e3d46220ccfbd
* | | Fail gracefully when camera app op is not enabled.Svetoslav2015-05-121-1/+7
| | | | | | | | | | | | Change-Id: I0c7c1dca1c0966efaf30bcfe12636953683712ab
* | | Merge "Revert "Add camera app op - camera"" into mnc-devSvetoslav Ganov2015-05-123-89/+55
|\ \ \ | |/ / |/| |
| * | Revert "Add camera app op - camera"Svetoslav Ganov2015-05-123-89/+55
| | | | | | | | | | | | | | | | | | | | | | | | This is not needed duplication of work This reverts commit 32fa6d0e65dbf956e253a1006e9419dce2fe75c9. Change-Id: I2c81b0dacb2ed99c408c79c1f9e22a4baa564494
* | | Merge "Camera2: allow mixing regular/reprocess requests" into mnc-devChien-Yu Chen2015-05-072-11/+9
|\ \ \ | |_|/ |/| |
| * | Camera2: allow mixing regular/reprocess requestsChien-Yu Chen2015-05-052-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | Allow mixing regular and reprocess requests in a capture burst. Also call abandon() when deleting an input stream. Bug: 20537735 Change-Id: If8c7781038173ab21c73f5ddc32f53793cf86fd9
* | | CameraService: update android.control.availableModesZhijun He2015-05-051-2/+37
| |/ |/| | | | | | | | | | | | | Only advertise CONTROL_MODE_OFF when manual 3A controls are supported. Also fixed some bug regarding static metadata update. Bug: 20734940 Change-Id: I5061f3c49ec20dc8cf5d849771c000fb82543e8f
* | Add camera app op - cameraSvet Ganov2015-05-023-55/+89
| | | | | | | | Change-Id: I26570cc0a23fdea740b416a26838d40cac296c85
* | camera2: Fix fuzztesting segfault in connect.Ruben Brunk2015-05-012-2/+23
| | | | | | | | | | Bug: 20721655 Change-Id: I0d974cad19683a8c86a76dac7f61ac0010bd977a
* | Camera: API1 shim: Don't tightly apply crop regionEino-Ville Talvala2015-04-302-93/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to older HAL compatibility, we have been setting a tight crop region that just bounds the current output streams. However, this did not take into account any possible ZSL output stream, so correct application of our stream cropping rules to ZSL results in double-crop scenarios, if the ZSL stream aspect ratio does not match the aspect ratio of the other output streams. Since all current HALs follow the correct stream cropping rules (or at least sufficiently ignore them for ZSL), simplify the cropping substantially - now either calculate the crop region based purely off the active array dimensions and zoom factor, or purely off the preview stream and zoom factor. The former is used for setting the request crop, and the latter is used for converting coordinates for metering regions. Bug: 20316691 Change-Id: I5a0bc2e7c09cf60fbae4220566540ca9e674d652
* | DO NOT MERGE: The preview frame data is broken when sending via Binderdaisuke jinno2015-04-281-1/+1
|/ | | | | | | | | | | [Cause] CallbackProcessor uses always same buffer to send preview data. A buffer is written before it is read by user process. [Solution] Increment buffer index correctly. Change-Id: I87a7e3dc6546448a419c96aa58ace3b7d086bf70
* Merge "CameraService: Add support for module init, some logging updates"Eino-Ville Talvala2015-04-164-72/+120
|\
| * CameraService: Add support for module init, some logging updatesEino-Ville Talvala2015-04-154-72/+120
| | | | | | | | | | | | | | | | | | - Add support for camera HAL module init() method on v2.4 - Add logging for service errors such as failure to init - Minor cleanup to dumping of event log Bug: 20016050 Change-Id: I94e18b52c186f16fb096457015f7ae761e867fd8
* | Merge "camera2: remove unnecessary flashlight error messages"Chien-Yu Chen2015-04-161-15/+18
|\ \
| * | camera2: remove unnecessary flashlight error messagesChien-Yu Chen2015-04-151-15/+18
| | | | | | | | | | | | | | | Bug: 20069129 Change-Id: I0e721bfad1f0218744d3554397e3ec9b8bc07a19
* | | Merge "Camera3: allow reconfiguring the input stream"Chien-Yu Chen2015-04-151-5/+1
|\ \ \ | |/ / |/| |
| * | Camera3: allow reconfiguring the input streamChien-Yu Chen2015-04-151-5/+1
| | | | | | | | | | | | Change-Id: Ia9d0db1f3378264fc9173bfc8706c8f955b79182
* | | Merge "Camera: allow non-supported template"Yin-Chia Yeh2015-04-151-3/+3
|\ \ \
| * | | Camera: allow non-supported templateYin-Chia Yeh2015-04-141-3/+3
| | | | | | | | | | | | | | | | | | | | Bug: 19395059 Change-Id: I42bbd99fef6055173062266c1a490311105c6814
* | | | Merge "Camera: fix invalid access of static_camera_characteristics"Yin-Chia Yeh2015-04-151-0/+6
|\ \ \ \
| * | | | Camera: fix invalid access of static_camera_characteristicsYin-Chia Yeh2015-04-151-0/+6
| |/ / / | | | | | | | | | | | | | | | | Bug: 20260866 Change-Id: Ib2b9ef807d66989515ac1a2e9f623fdd226a665a
* | | | Merge "camera: Actually pass device errors to client for Camera2Device."Ruben Brunk2015-04-152-0/+36
|\ \ \ \ | |_|_|/ |/| | |
| * | | camera: Actually pass device errors to client for Camera2Device.Ruben Brunk2015-04-152-0/+36
| | | | | | | | | | | | | | | | | | | | Bug: 19186859 Change-Id: Ib58588dfd99956b719c34e62c596ea604d97edcb
* | | | Camera2: Add prepare for output streamsEino-Ville Talvala2015-04-1520-37/+641
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "camera2: add reprocess support"Chien-Yu Chen2015-04-1413-37/+296
|\ \ \
| * | | camera2: add reprocess supportChien-Yu Chen2015-04-1313-37/+296
| | |/ | |/| | | | | | | | | | | | | | | | Add support to create input stream, submit reprocess capture requests, and receive reprocess capture results. Change-Id: Iee2d4313f3d52616a484eaea7a28f5ef9d8a674b
* | | Merge "camera: Fix client eviction/disconnect race."Ruben Brunk2015-04-143-4/+75
|\ \ \ | | |/ | |/|
| * | camera: Fix client eviction/disconnect race.Ruben Brunk2015-04-133-4/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add blocking wait in camera service connect call to prevent race when client has called disconnect while eviction of that client is taking place, resulting in early call of device initialization before all HAL resources are available. Bug: 20038135 Change-Id: I7afc5bfa23612ba7f83293fa542ff983a5991230
* | | Merge "camera: Update camera service logging and validation."Ruben Brunk2015-04-102-45/+138
|\ \ \ | |/ / | | / | |/ |/|
| * camera: Update camera service logging and validation.Ruben Brunk2015-04-092-45/+138
| | | | | | | | | | | | | | | | | | - Expand the logging included by the camera service. - Update user validation checks in connect calls so that these can be correctly called from the camera service. Bug: 20063426 Change-Id: I0a8cbe1ea2c0a652298e6b70c89705da174a50e1
* | Camera2Client: support HAL version 3.3Zhijun He2015-04-071-1/+2
|/ | | | Change-Id: Id018e3ce21b4344d09a877395eb355adba9e8fa2
* Merge "camera2: Enforce client eviction on user switch."Ruben Brunk2015-03-312-18/+134
|\
| * camera2: Enforce client eviction on user switch.Ruben Brunk2015-03-312-18/+134
| | | | | | | | | | Bug: 19186859 Change-Id: I172a2ce46c8e8a131ae7e8dd99d60c5f4f0d6668
* | Merge "Camera: iterate through all encoders for finding max video size"Yin-Chia Yeh2015-03-311-6/+20
|\ \ | |/ |/|
| * Camera: iterate through all encoders for finding max video sizeYin-Chia Yeh2015-03-311-6/+20
| | | | | | | | | | Bug: 19712132 Change-Id: I5c1fc748fcc756f6665c31951f8af8a37ff4254d
* | Merge "Camera: fix release fence logic"Yin-Chia Yeh2015-03-251-26/+9
|\ \
| * | Camera: fix release fence logicYin-Chia Yeh2015-03-241-26/+9
| |/ | | | | | | | | | | | | | | | | According to spec, HAL will set release_fence to acquire_fence when error happened (usually during flush call). Camera service should not refer to the acquireFence anyhow since per spec HAL needs to set it to -1 if acquireFence has been waited on. Change-Id: I809355d0c8c71f78f657e37d19221fd1f5bdc90b
* | Merge "Camera: fix metadata assertion"Yin-Chia Yeh2015-03-252-12/+9
|\ \
| * | Camera: fix metadata assertionYin-Chia Yeh2015-03-242-12/+9
| | | | | | | | | | | | | | | Bug: 19897963 Change-Id: I6b383c4750f31691a1c02e927bbeb0c1998a9eff
* | | Merge "camera: update CameraModule"Yin-Chia Yeh2015-03-245-48/+65
|\ \ \ | |/ /
| * | camera: update CameraModuleChien-Yu Chen2015-03-245-48/+65
| |/ | | | | | | | | | | | | | | | | | | 1. Add more accessor methods to CameraModule to prevent exposing raw module pointer 2. Use KeyedVector to replace array Bug: 19897963 Change-Id: I111cc093f09f5fb3c4b13693d5d0687e1f441058
* | camera2: Remove ProCamera.Ruben Brunk2015-03-208-667/+2
|/ | | | | Bug: 19186859 Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
* Merge "Fix link error of PROCESS_STATE_NONEXISTENT."Chih-Hung Hsieh2015-03-191-1/+5
|\
| * Fix link error of PROCESS_STATE_NONEXISTENT.Chih-Hung Hsieh2015-03-191-1/+5
| | | | | | | | | | | | | | | | | | * A reference to PROCESS_STATE_NONEXISTENT will cause link error with clang or standard C++ compiler because there is no out-of-class definition, although g++ is allowing it. Use +PROCESS_STATE_NONEXISTENT to get the value instead of reference. Change-Id: I62049584b94e6847b64b572f6ef6c3e9dcc573eb
* | Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-1923-43/+50
|\ \ | |/ |/|
| * Camera: plumbing rotation field throughYin-Chia Yeh2015-03-1823-43/+50
| | | | | | | | Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
* | Merge "camera2: Add camera client eviction enforcement."Ruben Brunk2015-03-1912-941/+2420
|\ \
| * | camera2: Add camera client eviction enforcement.Ruben Brunk2015-03-1812-941/+2420
| | | | | | | | | | | | | | | | | | | | | | | | | | | - This updates the CameraService to implement client eviction behavior based on process priority. Bug: 19186859 Change-Id: I646939b1cdf1a2237c4e5044164d55a2542cf36e
* | | libcameraservice: Stop using IGBC::BufferItemDan Stoza2015-03-129-16/+15
| |/ |/| | | | | | | | | | | | | Switches all uses of IGraphicBufferConsumer::BufferItem (and BufferQueue::BufferItem) to the BufferItem in libgui. Depends on frameworks/native I699ed0a6837076867ca756b28d1ffb2238f7a0d9. Change-Id: I187b3a7d05196b6289596afac8fb9a9d4aebff76
* | Camera: Wire up dataSpace, clean up ICameraDeviceUserEino-Ville Talvala2015-03-0623-53/+93
|/ | | | | | | - Remove unused arguments from ICameraDeviceUser::createStream - Add dataSpace as a stream parameter, plumb it through everything Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb