Commit Graph

940 Commits

Author SHA1 Message Date
Emilian Peev
8000869cb3 Camera: Add Jpeg/R stream configuration metadata
Bug: 241284696
Test: Camera CTS
Change-Id: If78cba575e3b771f5b7d49c78d50b0ca2c76744f
2022-12-16 11:09:21 -08:00
Steven Moreland
65ee297ef9 Merge "Mark modules frozen explicitly." 2022-12-12 18:27:49 +00:00
TreeHugger Robot
4dc8e55af7 Merge "Camera: Add extension specific metadata section" 2022-12-08 18:09:56 +00:00
Steven Moreland
edff13e314 Mark modules frozen explicitly.
Makes it easier to see which versions are available.

Bug: 188871598
Test: N/A
Change-Id: Ica76a8225fec8dc5267362cbfd43e06e65ad3f1e
2022-12-08 18:02:08 +00:00
Vadim Caen
79ee3e0e97 Merge "Enable Rust backend for Camera HAL" 2022-12-07 20:15:33 +00:00
Greg Kaiser
9b77fd1272 Fix NULL check
We were checking 'info' twice and not checking 'msgs'.  So we
fix that up, and fix a typo in the message.

Bug: 219974678
Test: TreeHugger
Change-Id: Ia52178b758dc3d9753731b043da01743ff59e10c
2022-12-05 17:06:02 -08:00
Avichal Rakesh
0d2d8a4b4d Camera: Move common-helper target out of HIDL directory
This CL moves the common helper classes from inside the HIDL directory
and refactors the HIDL-esque namespaces to android style namespaces.

To preserve compatibility, the header files export the new symbols under
old namespace and the old build module exports symbols from the new
build module. This refactor is transparent to the codebase.

Also ran clangformat to appease the repohook gods.

Bug: 219974678
Test: Existing VTS tests pass on Cuttlefish
Change-Id: I8c3160497c1e2fe7a0a7155641f0e1f5e47ec32e
2022-12-01 05:09:21 -08:00
Avichal Rakesh
e1857f8dbd Migrate reference external HAL implementation to AIDL
Android T migrated the HAL interface to AIDL, but the reference HAL
was never updated to use AIDL. This CL migrates the reference
HAL implementation for external cameras to use AIDL as well. The
external HAL uses V4L2 standard to expose USB cameras to the
cameraserver.

The reference HAL implementation for internal camera was dropped
because it is not possible to write a generic HAL that works with some
large percentage of internal cameras.

Bug: 219974678
Test: Existing CTS tests pass with external camera connected.
Change-Id: I35f3dc32c16670eca7735a4ac00fed3daf36aa65
2022-12-01 05:09:18 -08:00
Emilian Peev
a67db85ec4 Camera: Add extension specific metadata section
Bug: 257136838
Test: Camera CTS
Change-Id: Iba2432b6ccec37c901a3e0b340e019e30c12fbf6
2022-11-30 15:27:44 -08:00
Vadim Caen
60741ed7a2 Enable Rust backend for Camera HAL
Change-Id: I70ee4b41d887a9e9b1345020df9d591abdba5c65
2022-11-24 09:15:48 +00:00
Devin Moore
b578c17076 Merge "Remove placeholder API from camera.provider" 2022-11-21 21:58:17 +00:00
Devin Moore
a3cc4931d8 Remove placeholder API from camera.provider
This API was added to work around an AIDL versioning issue that has now
been fixed.
The changed imports now count as a change to the interface, so this
placeholder API is no longer needed.

Test: m
bug: 237048744
Change-Id: I6c3edb156435b5d66578fe8250716333e0f54d6e
2022-11-21 17:31:15 +00:00
Shuzhen Wang
4dd6a516a6 Camera: Add new camera metadata for settings override frame number
Add a frame number field in HAL capture result metadata to indicate
the frame number of newer request overriding this capture.

This is needed so that ZoomRatioMapper can look up the newer request's
zoom ratio.

Also add VTS test for transition between OFF and ZOOM.

Test: Camera VTS on cuttlefish
Bug: 239822823
Change-Id: I7439950cdb9f346bf36c4cc872fd7865eb9cf669
2022-11-17 00:42:57 +00:00
Bharatt Kukreja
ea43fb740c Merge "Camera: Add autoframing API" 2022-11-16 23:34:45 +00:00
Treehugger Robot
ba3c21e1f9 Merge "Add pointer to default AIDL Camera HAL Implementation in README.md" am: 14762528b0 am: db93905f18 am: b5988d0f35
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2300028

Change-Id: I1f7cc78b8bbefa2a32b72edbe9f7069d98e40589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 18:09:33 +00:00
Treehugger Robot
db93905f18 Merge "Add pointer to default AIDL Camera HAL Implementation in README.md" am: 14762528b0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2300028

Change-Id: Ib5ee7b72bde9bf53e1a91dc41add4c55e5ae1c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 17:05:43 +00:00
Treehugger Robot
14762528b0 Merge "Add pointer to default AIDL Camera HAL Implementation in README.md" 2022-11-14 16:32:20 +00:00
Jayant Chowdhary
752fc7d851 Add pointer to default AIDL Camera HAL Implementation in README.md
Bug: 258543462

Test: N/A

Change-Id: Iec00fd6ffa9422ccc5a664d419e658dcb01bfbcc
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-11-13 04:29:49 +00:00
Bharatt Kukreja
cbbc870ba8 Camera: Add autoframing API
The new API can be used to keep objects in the frame's fov.
Auto-generated file from changes in metadata_definitions.xml

Bug: 234004829
Test: Successful build
Change-Id: I68b1c38a67427aba3fa0ef9f21fb526199953682
2022-11-07 18:38:54 +00:00
Steven Moreland
eaa8469b7c Merge "graphics.common V3 -> V4" 2022-11-02 21:21:29 +00:00
Shuzhen Wang
36518f8eef Revert "Camera VTS: Improve test for torch callback"
This reverts commit f415f561a8.

Current HAL assumes that no new setCallback() is called after the start
of camera provider. Having more than one callback listeners breaks that
implicit assumption. It may not be trivial for HAL to add support for
multiple callback listeners

Test: CameraAidlTest#setTorchMode passes
Bug: 251111588
Change-Id: Idd2a250dc325b1a1080c1fa6562507e563cf545c
2022-10-31 21:38:16 +00:00
Steven Moreland
ed27779d14 graphics.common V3 -> V4
Bug: 251177105
Test: builds
Change-Id: I1cb84ec85f98789d0737207a1661b39a25538c96
2022-10-29 00:51:21 +00:00
Bharatt Kukreja
ab80f9f5a0 Camera: Add settings override API
The new API can be used to speed up certain controls (such as
zoom) with capture request.

Auto-generated file from changes in metadata_definitions.xml

Bug: 239822823
Test: Successful build
Change-Id: I73faf396e8e050b4fda19c013a1542cc03b9af08
2022-10-25 02:52:47 +00:00
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