summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice
Commit message (Collapse)AuthorAgeFilesLines
...
| * | camera: Add AIDL interface for CameraServiceProxy.Ruben Brunk2015-05-202-0/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | - Adds an AIDL interface to allow the proxy camera service running in system server to accept RPCs from the camera service running in mediaserver. - Request an update to the valid user set from the proxy camera service when mediaserver restarts to initialize properly + avoid DOS after a crash. Bug: 21267484 Change-Id: Ib821582794ddd1e3574b5dc6c79f7cb197b57f10
* | Merge "CameraService: Logcat conflicting devices on rejected open" into mnc-devEino-Ville Talvala2015-05-201-0/+4
|\ \
| * | CameraService: Logcat conflicting devices on rejected openEino-Ville Talvala2015-05-191-1/+5
| |/ | | | | | | | | | | | | | | | | Already in dumpsys log, but also put into logcat for feedback reports Also fix a minor warning about an uninitialized variable. Bug: 21063372 Change-Id: I04b45932e4500ac72aaa1cb724abc8a82a0e70e8
* | Camera: API1 shim: notify shutter correctlyYin-Chia Yeh2015-05-195-12/+65
|/ | | | | | | | | Previous implementation only notifies the callback when we receive full capture result. This implementation notifies the callback once HAL sends capture start callback. Bug: 12530628 Change-Id: Ibf71d532b5cf649514b316e35683c217021698b4
* camera2: Fix work-profile eviction handling.Ruben Brunk2015-05-142-39/+78
| | | | | Bug: 20124384 Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
* Merge "camera2: Fix empty set handling for eviction." into mnc-devRuben Brunk2015-05-141-9/+11
|\
| * camera2: Fix empty set handling for eviction.Ruben Brunk2015-05-141-9/+11
| | | | | | | | | | Bug: 20304829 Change-Id: I120ed6e41ca592c3770797a5fb1e5ce556543949
* | Merge "Camera: update CameraModule deriveKey" into mnc-devYin-Chia Yeh2015-05-131-0/+12
|\ \
| * | Camera: update CameraModule deriveKeyYin-Chia Yeh2015-05-071-0/+12
| | | | | | | | | | | | | | | | | | | | | To add derived keys into availableCharacteristicsKey. Bug: 20883751 Change-Id: I49d6d1bb79e6f31825dbfdebb039acbd5d9abe68
* | | Merge "Camera: Cleanup to prepare() implementation" into mnc-devEino-Ville Talvala2015-05-132-11/+6
|\ \ \
| * | | Camera: Cleanup to prepare() implementationEino-Ville Talvala2015-05-132-11/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | - Mutexes _might_ be a good idea - Don't be surprised by behavior that's expected - Use the existing logging macros Bug: 20537148 Change-Id: Ie62985a786d7e6645b4e4fe019dd98b02891a1f7
* | | Merge "camera2: Fix arbitration priority calculation." into mnc-devRuben Brunk2015-05-132-42/+6
|\ \ \
| * | | camera2: Fix arbitration priority calculation.Ruben Brunk2015-05-122-42/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | - Simplify priority calculation + handle constants added for device sleep: FOREGROUND_SERVICE and TOP_SLEEPING. Bug: 19186859 Change-Id: Ia2a5517cd3150deaccb58a0aa1eaa583cb769add
* | | Merge "mediaresourcemanager: change resource manager service log to use ring ↵Ronghua Wu2015-05-122-362/+1
|\ \ \ | | | | | | | | | | | | buffer." into mnc-dev
| * | | 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
|\ \