summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add default for pre-distortion active array.Ruben Brunk2015-06-221-0/+9
| | | | | | | | | | Bug: 20491394 Change-Id: I53b0539b37cc7a042e6765c97775b8c2bbba7159
* | Camera3Device: Fix high speed configurationChien-Yu Chen2015-06-181-1/+5
|/ | | | | | | | If high speed mode changed, HAL needs to reconfigure the streams even when the stream configurations don't change. Bug: 21900311 Change-Id: I76aee456b3b6d8c8f599a1638dcd38d75553a235
* Merge "Fix rounding width." into mnc-devRuben Brunk2015-06-121-3/+2
|\
| * Fix rounding width.Ruben Brunk2015-06-121-3/+2
| | | | | | | | | | Bug: 19930700 Change-Id: I9d5685bd98a049fcb01f6ecc649f15f3b4498e6d
* | CameraService: Add consumer name to output stream dumpsysEino-Ville Talvala2015-06-0921-47/+56
|/ | | | | | | | | | Also switch use of ANativeWindow to Surface, to get to the getConsumerName() method where necessary. Surface can always be cast to ANativeWindow, but not the other way around, so it's a better option anyway. Change-Id: Ie5c2d30821c1a754f9e382699ff50b4b328288b3
* Camera3Device: Default-initialize operating mode.Eino-Ville Talvala2015-06-091-1/+2
| | | | | | | | Since configureStreams is only called by CameraDeviceClient, the operation mode could default-initialize to CONSTRAINED_HIGH_SPEED for API1 operation. Change-Id: Ide71af07ca3925db8e450d00def1daeb44d8046a
* Camera1 API: Support SW encoders for new camera HALsEino-Ville Talvala2015-06-0815-50/+141
| | | | | | | | | | | | - Support new set video format/dataspace command in camera service - HALv3: Select gralloc usage flags based on format - HALv1: Pass format command directly to HAL layer - Use format/dataspace command in CameraSource - Switch all API1 recording to use metadata mode - Switch all >= HALv2 API1 recording to use kMetadataBufferTypeANWBuffer Bug: 13222807 Change-Id: I2e609b92c65792611bb1dab09e0c41c363ebbc42
* Camera: Change error for app ops reject, propagate binder errorsEino-Ville Talvala2015-06-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | INVALID_OPERATION surfaces as an non-specific device-level error to applications in the onError callback. This is not a condition apps targeting camera2 in L will generally have to deal with. Instead, return -EACCESS which maps to throwing CameraAccessException.CAMERA_DISABLED, same as disabling camera access with DevicePolicyManager. The old camera API converts any error code to -EACCESS at the JNI layer, so this doesn't change anything for the older API. Also update the various native ICameraService binder connect calls to check for the transact error code, and return it if it is not OK. Without this, PERMISSION_DENIED transact errors from the camera service cannot be distinguished from CAMERA_DISABLED errors in some codepaths. Bug: 21604925 Change-Id: Ifccc8989b8c20653429e2d3e51dba7abb2be9c35
* Camera2: implement high speed video APIsZhijun He2015-06-038-10/+53
| | | | | Bug: 21442271 Change-Id: Ia0ae5bbd3e8c81bad293c29987301a2457817d12
* Merge "Track camera and flashlight usage in battery stats." into mnc-devRuben Brunk2015-06-024-51/+205
|\
| * Track camera and flashlight usage in battery stats.Ruben Brunk2015-06-014-51/+205
| | | | | | | | | | | | Bug: 15986092 Change-Id: I9dc6828332e4091fd93bf2d82839e8e3862a2fc2
* | Camera3: fix aborting reprocess requestsChien-Yu Chen2015-06-012-24/+39
| | | | | | | | | | | | | | | | | | | | | | | | Get an input buffer right after camera service takes one reprocess capture request from the request queue to prevent the input buffers getting out of order. When aborting pending reprocess requests in the request queue, also abort the same amount of input buffers. Bug: 21028914 Change-Id: I7cfacecb4c24509f59c983abd587db5a403237bd
* | Merge "Camera: derive LSC characteristics keys" into mnc-devYin-Chia Yeh2015-05-281-2/+28
|\ \
| * | Camera: derive LSC characteristics keysYin-Chia Yeh2015-05-281-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | Also fix a typo in AWB lock available key. Bug: 21403373 Bug: 20883751 Change-Id: I5156f4fafcf4ae86f680fb618966c7cc58900120
* | | Camera3Device: Do not call cleanUpFailedRequest with mutex heldEino-Ville Talvala2015-05-281-10/+14
| | | | | | | | | | | | | | | | | | | | | Double-acquiring a non-recursive mutex tends to work poorly. Bug: 21498811 Change-Id: I1d59959fca69c97684522195808019797f7a6a7d
* | | Camera3Device: Close hole in prepare in-use stream checkEino-Ville Talvala2015-05-272-0/+22
|/ / | | | | | | | | | | | | | | | | | | | | | | | | There's a narrow window in which a capture request is neither in the request queue or handed off to the HAL, which can be expanded to some size if buffers have to be allocated. During this window, the prepare() method will not correctly notice that a stream should be considered in use. Add a member to contain the current request being processed, and check against it in prepare as well. Change-Id: I3a198d617f5feee0a3332af4b4439f24eda28ea3
* | Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-devRuben Brunk2015-05-202-0/+15
|\ \
| * | 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