Commit Graph

917 Commits

Author SHA1 Message Date
Austin Borger
3ab0c3acf5 Merge "Create API for reporting color space support to Camera2 framework consumers." 2022-10-24 17:25:11 +00:00
Austin Borger
4728fc48cc Create API for reporting color space support to Camera2 framework consumers.
Test: Ran CtsCameraTestCases.
Test: Ran VtsAidlHalCameraProvider_TargetTest.
Test: Created app to test display P3 camera, switching between color spaces
Bug: 238359088
Change-Id: I382dea5d13582817959001246240141e83d8172d
2022-10-21 11:01:18 -07:00
Steven Moreland
94fd5f2e30 camera aidl: 'empty' native handles not 'null' native handles am: 29b87463f4 am: eea598ddce am: 13d8d11900
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2250554

Change-Id: I45249077e3743a2dcb230e9055bc047dce8923b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 02:52:43 +00:00
Steven Moreland
eea598ddce camera aidl: 'empty' native handles not 'null' native handles am: 29b87463f4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2250554

Change-Id: I2148508663f577884f2352d6de5580f277b968e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 01:35:06 +00:00
Steven Moreland
29b87463f4 camera aidl: 'empty' native handles not 'null' native handles
Bug: N/A
Change-Id: I789d90e2c3d73a57658fbcc7a87723251f9c9096
Test: N/A
2022-10-11 22:45:18 +00:00
kongchenrui
0938e261fb Fix the problem that the data field of Entry in the verifyLogicalOrUltraHighResCameraMetadata function is empty am: 7549241c15 am: 65ebae18f7 am: c1065f69fa am: 118393954c am: fccc9c8fed am: c4645fe077
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2228941

Change-Id: Icd8852129e41316ad9beb0f1942ff2027556ea3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 23:14:01 +00:00
kongchenrui
fccc9c8fed Fix the problem that the data field of Entry in the verifyLogicalOrUltraHighResCameraMetadata function is empty am: 7549241c15 am: 65ebae18f7 am: c1065f69fa am: 118393954c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2228941

Change-Id: I9cd88b4e63900ed1ebc3d7182c021a16dbac17ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 22:45:06 +00:00
kongchenrui
65ebae18f7 Fix the problem that the data field of Entry in the verifyLogicalOrUltraHighResCameraMetadata function is empty am: 7549241c15
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2228941

Change-Id: I102d6c279198f701576e3831983404d96a9a613e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 21:17:50 +00:00
kongchenrui
7549241c15 Fix the problem that the data field of Entry in the verifyLogicalOrUltraHighResCameraMetadata function is empty
The reason for this problem is: local variables are used when saving
PhysicalCameraCharacteristics. When its life cycle ends, physChars will
be released. Since Entry uses a pointer, data will be null. So physChars
should be defined outside else to ensure that physChars is not released
during use

Bug: 248221707
Test: VtsHalCameraProviderV2_4TargetTest
Test: VtsAidlHalCameraProvider_TargetTest
Signed-off-by: kongchenrui <kongchenrui@xiaomi.com>
Change-Id: I4c05e695d255f210f310f8ce78ec2fa71a42cee9
2022-09-28 20:35:55 +00:00
Shuzhen Wang
f415f561a8 Camera VTS: Improve test for torch callback
Test below sequence:
- ICameraProvider::setCallback
- setTorchMode(on)
- verify torch mode on callback is received
- ICameraProvider::setCallback
- verify torch mode on callback is received again

This makes sure if torch is on, a new callback registration will trigger
a flash-on callback.

Test: atest VtsAidlHalCameraProvider_TargetTest
Bug: 247038031
Change-Id: I6cea64fcd08fd68fda78b3c0efb7763b7de6edbc
2022-09-20 01:35:20 +00:00
Sally Qi
784c253a05 Add cc_defaults as wrapper for graphics composer/common AIDL
interfaces.

- Add new Android.bp in graphics folder and wrap composer and common
  AIDL in to separate cc_defaults.
- remove composer3 dependency from allocator's VTS .bp file.

Bug: 243429120
Test: builds
Change-Id: Ia91e4ab87b7ac86248094317185b317d5604e654
2022-08-26 15:18:42 -07:00
Xin Li
7406132b49 Merge android13-tests-dev
Merged-In: Ie372f74f3a52decce592181c7d65624f8ec03ed1
Change-Id: Ia81e24391de0d26737a5d65fbc5c8bb86bf03d5b
2022-08-17 16:37:46 -07:00
TreeHugger Robot
58f71f3599 Merge "Camera: Import gralloc buffers before metadata queries" into stage-aosp-tm-ts-dev am: f9daf08b7b am: ee100afbbd am: 2d5d3855ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19125050

Change-Id: Icb57c2106ef02bc7ee629a1bfbaf005bc82461be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:30:13 +00:00
TreeHugger Robot
a7aa860878 Merge "Camera: Import gralloc buffers before metadata queries" into stage-aosp-tm-ts-dev am: f9daf08b7b am: ee100afbbd am: 552a9119e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19125050

Change-Id: I27f49a2f51ed0b78a2b8e26a57641c921c4575db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:29:51 +00:00
TreeHugger Robot
2d5d3855ed Merge "Camera: Import gralloc buffers before metadata queries" into stage-aosp-tm-ts-dev am: f9daf08b7b am: ee100afbbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19125050

Change-Id: Ib81bd2c22beb4c1ae50f90bf0ffe6d00252e2a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:12:49 +00:00
Emilian Peev
dda1eb771c Camera: Import gralloc buffers before metadata queries
Raw buffer handles do not support metadata queries and need
to be imported first.
Additionally map the result buffer ids to the inflight
buffers and queue the maximum amount of inflight buffers
as advertised by Hal. Since we will be streaming a set
of buffers, use an appropriate preview size.

Bug: 237576060
Test: adb shell
/data/nativetest64/VtsAidlHalCameraProvider_TargetTest/VtsAidlHalCameraProvider_TargetTest
--gtest_filter=PerInstance/CameraAidlTest.process10BitDynamicRangeRequest/0_android_hardware_camera_provider_ICameraProvider_internal_0

Change-Id: Id854c2a8d1588a151240d1b32197dbace7e1a057
2022-07-28 16:40:35 -07:00
Rucha Katakwar
69f0be42b6 Update the HAL side about torch max level safety. am: 87a2e092ae am: 2ca2d808e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19347559

Change-Id: Iad6bb25369c6e193c8247b832d3d698ae69b14b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 00:03:11 +00:00
Rucha Katakwar
b43f5efd3c Update the HAL side about torch max level safety. am: 87a2e092ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19347559

Change-Id: I41e0f78f2c03e05de1cf657fbe8314ca1dc227cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 23:48:22 +00:00
Rucha Katakwar
87a2e092ae Update the HAL side about torch max level safety.
Bug: 239492786
Change-Id: I59dc2acc89c617be4551a4d92494a47b782d5e13
2022-07-19 15:42:35 -07:00
Jooyung Han
c0b24f4f13 Remove AIDL-libs from VNDK
Some are still in VNDK because they are used in other VNDK libs.

Ignore-AOSP-First: some libs are still in internal master only.

Bug: 234181591
Test: m
Merged-In: If999df9c78a20df931177da11742b1c5de19bc08
Change-Id: If999df9c78a20df931177da11742b1c5de19bc08
(cherry picked from commit 5527adfd7f)
2022-06-14 14:08:59 +09:00
Jayant Chowdhary
e8919888ad Merge "Delete HIDL 3.8" into tm-dev 2022-05-26 05:16:33 +00:00
Avichal Rakesh
c607536abc Merge "Camera VTS: remove duplicate function in anonymous namespace" into tm-dev am: 7fdc10af19
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18565634

Change-Id: I02d300ccbac6da6238924a840cd6b9af736e0953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 02:12:07 +00:00
Jayant Chowdhary
9ab187f118 Delete HIDL 3.8
- HIDL camera device@3.8, metadata@3.8 were temporary interfaces

Bug: 221108824

Test: GCA
Test: Camera CTS

Merged-In: I44cd1ac0e2f6647e3e9d5c60a535faf716d5ed93
Change-Id: I44cd1ac0e2f6647e3e9d5c60a535faf716d5ed93
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit 406da44909)
2022-05-25 23:43:33 +00:00
Avichal Rakesh
9a66549f5c Merge "Camera VTS: Fix incorrect return value check" into tm-dev am: 7ab50a866a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18565633

Change-Id: I06a72c76a21d34f16a64e20b06f2e959db72a078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 20:59:52 +00:00
Jayant Chowdhary
406da44909 Delete HIDL 3.8
- HIDL camera device@3.8, metadata@3.8 were temporary interfaces

Bug: 221108824

Test: GCA
Test: Camera CTS

Change-Id: I44cd1ac0e2f6647e3e9d5c60a535faf716d5ed93
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-05-25 04:15:23 +00:00
Avichal Rakesh
9f352766a9 Camera VTS: remove duplicate function in anonymous namespace
The anonymous namespace in camera_aidl_test.cpp contained a buggy
implementation of `matchDeviceName` can was being called into by a few
tests. This CL removes the buggy implementation and fixes the faulty
calls to call into the correct function.

Bug: 233252432
Bug: 233221359
Test: atest VtsAidlHalCameraProvider_TargetTest
Change-Id: Icfe9bbc75e38d4d23bdcf64a048120708045b639
2022-05-24 21:07:53 +00:00
Avichal Rakesh
4bf91c7e38 Camera VTS: Fix incorrect return value check
The AIDL interface specificies that ICameraProvider::setCallback should
return Status::ILLEGAL_ARGUMENT if the provided callback is null. The
setCallback test incorrectly checked for the return value to be OK
instead.

This CL fixes the test to check for ILLEGAL_ARGUMENT and removes setting
callback to null from setTorchMode test. In addition it fixes
`setCallback` test to use Bn* variant of ICameraProviderCallback to
ensure that the object makes it through the binder.

Bug: 233221359
Test: atest VtsAidlHalCameraProvider_TargetTest
Change-Id: Ia33226b15efd9628bf8e1b53ec2a3012b08eaaac
2022-05-24 21:06:41 +00:00
Shuzhen Wang
5c036af317 Camera: Fix broken link in doc
Test: Build
Bug: 231252657
Change-Id: I4118369e0f387128dcbba746cb2be18627da7f36
2022-05-03 12:40:58 -07:00
TreeHugger Robot
e279de9421 Merge "Camera: Correct request settings R&C override" into tm-dev 2022-04-20 22:48:58 +00:00
Emilian Peev
3d919f9f6c Camera: Correct request settings R&C override
Assign the R&C overriden 'settingsMetadata' in the capture request.

Bug: 222648486
Test: adb shell VtsAidlHalCameraProvider_TargetTest
--gtest_filter=PerInstance/CameraAidlTest.processMultiCaptureRequestPreview/0_android_hardware_camera_provider_ICameraProvider_internal_0

Change-Id: I5825ebae59e8d3c05e5c301825b0ab8e6c1f50dc
2022-04-20 13:53:00 -07:00
Jiyong Park
70f5837e1f Freeze AIDL APIs for TM
Bug: 225941299
Test: m
Change-Id: I61eb51c0334eb99489c6f1570110d7e18c350c99
2022-04-16 07:03:24 +09:00
Jiyong Park
703e97920e Freeze AIDL APIs for TM
Bug: 225941299
Test: m
Change-Id: Ie41cc0797710f813f92c65c387f247c7806d8394
2022-03-31 12:01:39 +09:00
Avichal Rakesh
e1685a735e Camera: Fix test to use 64 bit pointer in stream use cases
I23a4324602 updated stream use cases to use 64 bit integers. The
`configureStreamUseCases` test was still using a pointer to 32 bit
integer to determine supported use cases. This CL updates how supported
use cases are populated to use a pointer to 64 bit integers instead.

Bug: 226171215
Test: `configureStreamUseCases` which was failing on cuttlefish is  now
      passing
Change-Id: I5b1ef4e8e344e43b10ea5c992afaace03608660d
2022-03-22 16:07:25 -07:00
Austin Borger
64f39ae2d8 Merge "Update AIDL files accidentally diverged from HIDL / libcamera_metadata." into tm-dev 2022-03-19 00:41:11 +00:00
Austin Borger
c31af39ecb Update AIDL files accidentally diverged from HIDL / libcamera_metadata.
Bug: 222124945
Test: Built android.
Change-Id: Iadec82bdb792f00ba475e07b5b62b363c5f56586
2022-03-18 19:11:29 +00:00
Austin Borger
1b7ebd2928 [AIDL] Add L to TagBoundaryId::VENDOR to indicate that it is a long
integer literal.

Bug: 225049648
Test: Ran m android.hardware.camera.common and observed output files
Change-Id: I098c8d537a9a9809ff3bd594c69b30c69b3b2ed9
2022-03-18 17:11:47 +00:00
Shuzhen Wang
f68d60d4af Merge "Camera: Increase bit depth of stream use case to 64" into tm-dev 2022-03-14 22:16:36 +00:00
TreeHugger Robot
5bf813a93e Merge "Camera: Misc VTS test fixes" into tm-dev 2022-03-10 00:24:55 +00:00
Shuzhen Wang
36efa7161a Camera: Increase bit depth of stream use case to 64
Test: Camera CTS
Bug: 223387965
Change-Id: I23a4324602ed37cf38c7a1a34dade615c4adb72b
2022-03-09 22:57:40 +00:00
Avichal Rakesh
fbcf7ea514 Camera: Misc VTS test fixes
This CL fixes two tests:
* `systemCameraTest`: Fix incorrect vector initialization. The test was
  accidentally using the size constructor instead of initialization list
  constructor.
* `processMultiCaptureRequestPreview`: Allow unsupported stream configs.
  The test assumed that all stream combinations from physical cameras
  that back a LogicalMultiCamera were supported. This led to false
  test failures. This CL allows the test to exit early if the HAL
  reports that a stream combination is not supported.

Bug: 222648486
Test: `test VtsAidlHalCameraProvider_TargetTest` pass on failing devices
Change-Id: I009cc2f4b8b94a26b813883cdc1403ae0eb5c477
2022-03-09 21:55:24 +00:00
Jayant Chowdhary
111ba0c821 Merge "Add automotive related keys to AIDL." into tm-dev 2022-03-09 00:50:44 +00:00
Jayant Chowdhary
54d7fb5029 Add automotive related keys to AIDL.
This CL adds a new automotive metadata section with below fields:
- AUTOMOTIVE_LOCATION describes where the camera exists.
- AUTOMOTIVE_LENS_FACING tells where the camera's lens is facing toward.

These were added to the temporary HIDL interface but not AIDL.

Bug: 223262543

Test: build

Change-Id: Id074c6878690767c89792f867a7754ae8193405d
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-03-08 21:51:55 +00:00
TreeHugger Robot
49175a3732 Merge "Added annotations to prevent misapply of this interface by OEM partners" into tm-dev 2022-03-02 05:08:52 +00:00
Avichal Rakesh
d3503a349f camera: Fix AIDL VTS test
The default value of a Stream's `dynamicRangeProfile` field is invalid,
which means the caller needs to set it to a sensible default with each
call. This CL updates the Stream creation in VTS test to use
`ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_STANDARD`
wherever a Stream object was being created with implicit default.

Bug: 210912368
Test: Existing VTS tests now pass on Cuttlefish
Change-Id: Iaae2f6dfde852fc9c076a6029854ccdf8f68d39a
2022-02-25 06:30:27 +00:00
Cliff Wu
ba362a8c19 Added annotations to prevent misapply of this interface by OEM partners
- This interface is only suitable for special camera injection hal,
  general camera hal does not need to implement it.

Test: Camera VTS
Bug: 219684073
Change-Id: I9b70e4640dff205008f3d6270f402b720b6b4434
2022-02-24 15:39:36 +08:00
Avichal Rakesh
51aa86c095 camera: Fix build errors due to CLs interleaving.
ag/16982347 and ag/16988237 were submitted around the same time, but
can cause build failure when put together. This CL fixes the
compilation issues and a few other other warnings.

Fix: 221154052
Test: Existing
Change-Id: Ia865e3bfc6cd77e7eff1efa5729d6db0d58c279d
2022-02-24 05:48:14 +00:00
Avichal Rakesh
442bb38258 Merge "Camera: Migrate VTS tests to AIDL" into tm-dev 2022-02-24 03:28:33 +00:00
Chih-hung Hsieh
34593d4e2a Merge "Add timed out test files to tidy_timeout_srcs" am: ff54f73b4f am: fa83970b3a am: 581616e658
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1992232

Change-Id: I2eac13fe3b5ab0b4f15d6ceadf376e5e74124a81
2022-02-24 01:32:09 +00:00
Chih-hung Hsieh
fa83970b3a Merge "Add timed out test files to tidy_timeout_srcs" am: ff54f73b4f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1992232

Change-Id: Ic6072a539d185abc0bcce2ef1dd4a96ddf70e3b8
2022-02-24 00:40:48 +00:00
TreeHugger Robot
0bd7074e39 Merge "Camera: Use 64bit integers for dynamic range profile values" into tm-dev 2022-02-24 00:27:29 +00:00