Commit Graph

460 Commits

Author SHA1 Message Date
TreeHugger Robot
4b5ff67c52 Merge "Camera: update camera HAL owners" 2018-10-16 22:15:16 +00:00
chenhg
81ed94e40e Merge "Avoid segfaults if disconnect USB camera while preview." am: 4dce57e459 am: 86ec58ff52
am: a169023679

Change-Id: I6f1b820f87297564c54b3ee656e201ec79838d78
2018-10-16 11:30:03 -07:00
chenhg
a169023679 Merge "Avoid segfaults if disconnect USB camera while preview." am: 4dce57e459
am: 86ec58ff52

Change-Id: I748a644556eb2dd2e68a2e4e965d3b57e8ed4895
2018-10-16 10:50:39 -07:00
Yin-Chia Yeh
ccc05ec9b7 Camera: update camera HAL owners
Add OWNER file to device 3.5 default implementation and
add new owners to existing owner file.

Test: N/A
Bug: N/A
Change-Id: I09bae8a6bbdf48bd27cba8675d979c65b51a3e6b
2018-10-16 08:47:03 -07:00
TreeHugger Robot
0836578d61 Merge "Camera: implement configureStreams@3.5" 2018-10-16 15:44:09 +00:00
Yin-Chia Yeh
86a7d9610d Camera: implement configureStreams@3.5
So camera continue to work when camera service switch to use
the @3.5 session.

Test: manually check configureStream works
Bug: 109829698
Change-Id: I4c7edcf59e68a2b4f04fee8229ed5d3c9b261c9f
2018-10-15 14:23:15 -07:00
chenhg
06ced051d9 Avoid segfaults if disconnect USB camera while preview.
BUG: 117575807
Test: manual test by disconnect USB camera while preview.

Change-Id: Ia74b03e7f2a672efd9e9dfd651b5894529daeeee
2018-10-12 14:17:04 -07:00
Shuzhen Wang
068b1c6a26 Camera: Minor doc update to fix typo
Test: Build, and manual inspection of docs
Change-Id: Ic1936b91f0b21d2c760068c841aec1f02ea448cb
2018-10-11 15:30:35 -07:00
Shuzhen Wang
6bdeaf55bf VTS: Add test for device version 3.5
Also includes:
- Add test for getPhysicalCameraCharacteristics.
- Doc update for the new HIDL API.
- Tighten boundary check for camera ID in CameraModule.

Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO

Bug: 79523700
Bug: 115969176
Bug: 116512585
Change-Id: I051d1b0c91834781a1f8d893ed5ebfa579b03774
2018-10-04 11:56:20 -07:00
Ng Zhi An
d6c009d46f Skip hal v1 check after p on low ram devices am: a0eb7e415c am: f8f519f412
am: cab24d270d

Change-Id: I5642eb8b968849c8a60488f372e5eac8bff77637
2018-10-02 15:47:05 -07:00
Ng Zhi An
cab24d270d Skip hal v1 check after p on low ram devices am: a0eb7e415c
am: f8f519f412

Change-Id: I26555fe00a1b8adf51b42ab694238169cde49c4d
2018-10-02 14:59:58 -07:00
Ng Zhi An
f8f519f412 Skip hal v1 check after p on low ram devices
am: a0eb7e415c

Change-Id: Ice8482bd701233d382f381f6204230caebc2cb44
2018-10-02 14:19:29 -07:00
Ng Zhi An
2f5884c94c Skip hal v1 check after p on low ram devices
am: a0eb7e415c

Change-Id: I7e60e9faf24be23bf08ef65c5f0c074d4e7da2a4
2018-10-02 14:02:09 -07:00
Ng Zhi An
a0eb7e415c Skip hal v1 check after p on low ram devices
Bug: 116546417
Test: vts-tradefed run commandAndExit vts
-m VtsHalCameraProviderV2_4Target
-t VtsHalCameraProviderV2_4Target#CameraHidlTest.noHal1AfterP

Change-Id: I28782b560975b49e20d6b42d599d689f819a9383
2018-10-02 19:52:50 +00:00
Yin-Chia Yeh
8ffafc60b6 Merge "Camera: new buffer management HIDL APIs" 2018-09-28 22:50:08 +00:00
Yin-Chia Yeh
6a6fe0f47b Camera: new buffer management HIDL APIs
No actual implementations yet.

Test: compile, new VTS to be written
Bug: 109829698
Change-Id: Ibe509dd743a84b147fdfed6599d8f066adb8793b
2018-09-27 11:13:13 -07:00
Yin-Chia Yeh
f6cde1cdcd Merge "Camera: add buffer management API support key" 2018-09-26 21:37:10 +00:00
Emilian Peev
8edae5199e Camera: Extend camera characteristics test case
Verify that device implementations do not set the
new privacy characteristics key:
ANDROID_REQUEST_CHARACTERISTIC_KEYS_NEEDING_PERMISSION
As required by API contract.

Bug: 112160024
Bug: 115969437
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I8d8f0d0e1cdec24117d47e7ae45602f56573376f
2018-09-18 14:32:28 +01:00
Yin-Chia Yeh
9ee5d7103c Camera: add buffer management API support key
Test: compile
Bug: 109829698
Change-Id: I654e07c9c5930bcbf3357d12d97ef32d198fdcc8
2018-09-17 12:03:07 -07:00
Shuzhen Wang
c4f5402488 Merge "Camera: Add support for physical camera characteristics query" 2018-09-13 19:57:49 +00:00
Shuzhen Wang
d3feb3d62c Camera: Add support for physical camera characteristics query
- Add version 3.5 for ICameraDevice for physical camera characteristics
query.
- Add version 3.5 for ICameraDeviceSession to work around HIDL
versioning bug.

Test: Camera CTS
Bug: 79523700
Change-Id: I8df6cdd4ee6ac5755758510c0dc1ea1cec31aa73
2018-09-13 09:25:34 -07:00
Emilian Peev
019114aa89 Camera: Add camera.metadata@3.4
The initial entry includes information about
static metadata that requires camera permission.

Bug: 112160024
Test: hidl-gen, builds
Change-Id: I3aa321edbfea4c2adaaeded3fd10c8746ed07aa7
2018-09-04 16:40:58 +01:00
Yin-Chia Yeh
8fd024c378 Merge "Camera: support torch control on external camera" am: f8007c2000 am: 361f2f9a17
am: fb5d713264

Change-Id: I5dbe1e94b8e6a49a57770717ff6f7c3702e6bb1c
2018-08-30 12:20:58 -07:00
Yin-Chia Yeh
fb5d713264 Merge "Camera: support torch control on external camera" am: f8007c2000
am: 361f2f9a17

Change-Id: I982aa7e7acb3e85c247319757516e85bf7408f82
2018-08-30 12:15:37 -07:00
Treehugger Robot
f8007c2000 Merge "Camera: support torch control on external camera" 2018-08-30 19:02:26 +00:00
Emilian Peev
81221c2f6c Merge "Camera: Allow 3% ISO tolerance during ISO burst VTS" into pie-vts-dev
am: 391eb588cf

Change-Id: Id897eee2251eee92267b4e32f7d245aca3eb1e88
2018-08-30 10:23:00 -07:00
Emilian Peev
fe40b621b7 Camera: Allow 3% ISO tolerance during ISO burst VTS
The advertised ISO ranges may not be entirely supported on
some devices. Expect a 3% tolerance when comparing the applied
results versus the expected ISO value.

Bug: 80025874
Test: run vts --skip-all-system-status-check --skip-preconditions
--primary-abi-only --module VtsHalCameraProviderV2_4Target -l INFO

Merged-In: Ibd2758e48a0924e81877e35dd27433669274fdb3
Change-Id: Ibd2758e48a0924e81877e35dd27433669274fdb3
(cherry picked from commit 0fdd7cdc0e)
2018-08-29 17:57:11 +00:00
Emilian Peev
a89c2d379e Merge "Camera: Don't hold 'mLock' when closing the camera session" into pie-vts-dev
am: 75ceb36b27

Change-Id: I3b3d8c2051dd89b0993bd17af77a6a19cd7792b6
2018-08-28 12:24:48 -07:00
Yin-Chia Yeh
bbc046ed67 Camera: support torch control on external camera
Claim torch API support though there is no device
actually has a flash unit. This is to workaround
an issue in camera service where it falls back
to legacy camera HAL1 control if the device does
not report torch API support (and external camera
HAL does not implement HAL1)

Test: CtsVerifier FlashLight test
Bug: 113336515
Change-Id: I945b35fecfed3b2698b1e9bb1d8faad8699258d2
2018-08-28 11:22:51 -07:00
Emilian Peev
6fa94395fd Camera: Don't hold 'mLock' when closing the camera session
After flushing the camera requests don't try to close the
camera session while still holding 'mLock'. Different Hals
could still try and return additional results which then will
get blocked on 'mLock'. Closing the session could potentially
introduce a deadlock if the Hal implementation waits for any
of the result calls to return.

Bug: 111836165
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I0f309f435cc76db3f9b6ba500da65a232b014717
Merged-In: I0f309f435cc76db3f9b6ba500da65a232b014717
(cherry picked from commit 8e92056837)
2018-08-28 18:17:55 +00:00
TreeHugger Robot
f711bd2714 Merge "Camera: plumb blob buffer size from framework" 2018-08-16 19:46:22 +00:00
Yin-Chia Yeh
4c64118f60 Camera: plumb blob buffer size from framework
Test: blob size is sent from camera service to webcam HAL
      using TestingCamera2
Bug: 72173567
Change-Id: I9937881d98dd7d984da5e6ec929118f5d8fe7c9e
2018-08-16 19:16:32 +00:00
Xin Li
b390ad2d90 Merge pie-vts-dev into master
Bug: 112170540
Merged-In: I48551f5469289b9fcfc47dd9fd2e455779640329
Change-Id: Icd613751ccf1dc8a0f879525f1d65b11dda7d357
2018-08-16 00:17:15 +00:00
TreeHugger Robot
5c8bb496e2 Merge "Camera: Minor doc update" 2018-08-15 23:44:23 +00:00
Steven Moreland
9dc1ccc852 Merge "Update makefiles after native handle in Java." am: 1847a2f2e7
am: fb6a66b3f7

Change-Id: Iee88bb1f9816230a1ea2373cca6a3f3bb5db2d6e
2018-08-14 15:59:59 -07:00
Steven Moreland
fb6a66b3f7 Merge "Update makefiles after native handle in Java."
am: 1847a2f2e7

Change-Id: I0f981009b2129436872e1e05a06c381c47701fdb
2018-08-14 15:53:31 -07:00
Steven Moreland
f5e4d7fb59 Update makefiles after native handle in Java.
Bug: 35098567
Test: N/A
Change-Id: I54b8d804e480cda09806f8028b966f28c4bd706e
2018-08-14 20:29:42 +00:00
Hsin-Yi Chen
68c347fa62 Fix ICameraDeviceCallback version in VTS test
Test: ./VtsHalCameraProviderV2_4TargetTest --gtest_filter=CameraHidlTest.constructDefaultRequestSettings
Bug: 111625570
Change-Id: I8ad02afb0e9c2131c240999c4a8c78a1f770e847
Merged-In: I8ad02afb0e9c2131c240999c4a8c78a1f770e847
(cherry picked from commit cccd5bf1dd)
2018-08-13 15:16:28 +08:00
chenhg
a7d82e577a Camera: provide thumbnail size for more jpeg aspect ratios. am: 564cdae552 am: 737cfdf4db
am: 7aa4b087f2

Change-Id: If90e3d059563d514fb69f69854739733542da691
2018-08-09 12:03:35 -07:00
chenhg
7aa4b087f2 Camera: provide thumbnail size for more jpeg aspect ratios. am: 564cdae552
am: 737cfdf4db

Change-Id: Ibbf8171753825afaaf7c46758e1d7edfde0ad53a
2018-08-09 12:00:33 -07:00
chenhg
564cdae552 Camera: provide thumbnail size for more jpeg aspect ratios.
BUG: 110462045
Test: Camera CTS
Merged-In: I5f5500a5e4d02c3cbaa127cd9f222d241f047044
Change-Id: I5f5500a5e4d02c3cbaa127cd9f222d241f047044
2018-08-09 17:49:57 +00:00
chenhg
781743b4b5 Merge "Camera: allow to configure minimum stream size." am: c2f3b0bcf5 am: 8050b86a96
am: 30faec33a0

Change-Id: I3aa078a9818403d68b212f5a961b252f2c329308
2018-08-08 11:57:57 -07:00
chenhg
30faec33a0 Merge "Camera: allow to configure minimum stream size." am: c2f3b0bcf5
am: 8050b86a96

Change-Id: I174457235246891dba965566fd711547c0ea2eae
2018-08-08 11:30:46 -07:00
chenhg
f2a6c47a9d Camera: allow to configure minimum stream size.
HW video encoder usually has limitation to encode very small
stream. Camera should avoid to return such streams to avoid
video encoding failure.

BUG: 110654511
Test: CTS android.hardware.camera2.cts.RecordingTest#testSupportedVideoSizes
Change-Id: I6104f2d4efcf7831d1dc6d305c82309e2fd1999d
2018-08-07 15:15:13 -07:00
Eino-Ville Talvala
5845a3f05c Camera: Minor doc update
Autogenerated from a larger set of total doc changes

Test: Builds, manual inspection of docs
Bug: 109817371
Change-Id: Ibc2415531a16e42ae81e33c3bdb28aca08e6a5fe
2018-08-06 10:57:34 -07:00
Yin-Chia Yeh
dd1419ba46 Legacy camera shim: add option to free buffers earlier am: 7d1fdecea5
am: 96ab6781f5

Change-Id: I9625af8482840860aca8022862832137de912377
2018-08-03 16:45:37 -07:00
Yin-Chia Yeh
96ab6781f5 Legacy camera shim: add option to free buffers earlier
am: 7d1fdecea5

Change-Id: I175ecfd4334849886252f9d6fb29aa16f9cfb500
2018-08-03 16:10:11 -07:00
Yin-Chia Yeh
7d1fdecea5 Legacy camera shim: add option to free buffers earlier
This option allows HAL to opt in for the behavior that will free
cached buffers earlier if the libhardware HAL implementation
doesn't cache/reference the cached buffers internally.

Test: buffers are freed earlier when the property is set
Bug: 111850884
Change-Id: I3a10b288c7160c86dc7d3a30d04b5c4903917731
2018-08-03 12:38:30 -07:00
Emilian Peev
3aace138e9 Camera: Don't hold 'mLock' when closing the camera session am: 8e92056837
am: addc3069bb

Change-Id: I79b201eea2bc097438219eb99627e93989954655
2018-07-26 09:47:27 -07:00
Emilian Peev
addc3069bb Camera: Don't hold 'mLock' when closing the camera session
am: 8e92056837

Change-Id: I9bdda2b5fbd92f6bb0d77f9a4809766f95a8b318
2018-07-26 09:44:24 -07:00