Commit Graph

902 Commits

Author SHA1 Message Date
Michelle Ho
388d4ffb3b Camera VTS: Override RotateAndCrop metadata
Per camera metadata definition, ROTATE_AND_CROP_AUTO will never be sent
to the HAL, as camera service takes reponsibility of translating AUTO to
specific rotation value. So for VTS tests, we should always override
the metadata in CaptureRequest.

Bug: 270052579
Test: Run VtsAidlHalCameraProvider_TargetTest
Change-Id: I96f4992e145da25c463b0b406aa2a371af30f41f
2023-02-22 10:19:13 +00:00
Treehugger Robot
ca60e0b71f Merge "Camera VTS: Remove unnecessary test of Y16 depth format" into android13-tests-dev 2023-02-09 00:44:15 +00:00
Shuzhen Wang
cd3c483ab0 Camera VTS: Remove unnecessary test of Y16 depth format
getAvailableOutputStreams() shouldn't unconditionally add Y16 stream
configurations. Instead, if the threshold being passed in is valid,
getAvailableOutputStreams() should use the threshold's format
instead.

Test: Run VTS on pixel; vendor testing.
Bug: 265984260
Change-Id: I3c8119c6032141bb6e2f95f060f014a13340d16b
2023-02-08 21:56:51 +00:00
Treehugger Robot
ceeef2d2bf Merge "Camera VTS: Keep buffer ids and frame numbers consistent" into android13-tests-dev 2023-01-25 22:25:06 +00:00
Emilian Peev
470d138062 Camera VTS: Keep buffer ids and frame numbers consistent
In case we have a camera device that doesn't support the
Hal buffer management mode, services are required to use
the frame number and stream id to deduce the specific
buffer id and Hals are not mandated to return valid
buffer ids as part of the capture result.

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

Change-Id: I3b10e91d38a13afcca45f26712cc5d5c241c2a32
2023-01-25 11:07:37 -08:00
Emilian Peev
7195938fe2 Camera VTS: Fix AIDL status typo
"physicalCameraDeviceStatusChange" returns a default
ScopedAStatus that will not include a valid AStatus instance.
This will result in binder instabilities once the status
is being parceled.
Return "ScopedAStatus::ok" instead.

Bug: 253993253
Test: adb shell VtsAidlHalCameraProvider_TargetTest
Change-Id: I219f608a04aaec0631e3de58a7e0d47a30294e52
2023-01-20 13:57:17 -08: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
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
Jayant Chowdhary
e8919888ad Merge "Delete HIDL 3.8" into tm-dev 2022-05-26 05:16:33 +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
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
Avichal Rakesh
362242f73c Camera: Migrate VTS tests to AIDL
This CL migrates the existing camera VTS tests to AIDL

Bug: 210912368
Test: Migrated all HIDL tests to AIDL
Change-Id: I4da6d38105d96908684a754da73699486295da8b
2022-02-23 23:44:01 +00:00
Emilian Peev
4ce76d242c Camera: Use 64bit integers for dynamic range profile values
Additionally extend the dynamic range profile map to include
hints about extra lookahead latency.

Bug: 215396395
Test: Camera CTS
Change-Id: I600a3147d94a9aad1a312b92aacee014c05db16f
2022-02-23 00:26:22 +00:00
Jayant Chowdhary
cb4853941b camera: Address ANAPIC review comments and additional cleanup
Bug: 218911443

Test: build

Change-Id: Ia6d3f4d73e9ff29fa5fca2e11e0b9cb5a8d1e2ac
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-02-22 23:35:25 +00:00
Chih-Hung Hsieh
ad1bf31b78 Add timed out test files to tidy_timeout_srcs
* Timed out runs do not show any warning messages.
* These test files cannot finish clang-tidy runs with
  the following settings:
    TIDY_TIMEOUT=90
    WITH_TIDY=1
    CLANG_ANALYZER_CHECKS=1
* When TIDY_TIMEOUT is set, in Android continuous builds,
  tidy_timeout_srcs files will not be compiled by clang-tidy.
  When developers build locally without TIDY_TIMEOUT,
  tidy_timeout_srcs files will be compiled.
* Some of these test modules may be split into smaller ones,
  or disable some time consuming checks, and then
  enable clang-tidy to run within limited time.

Bug: 201099167
Test: make droid tidy-hardware-interfaces_subset
Change-Id: I1de28f1572fff368f67eab512fffec9f2e5c2a9b
2022-02-18 17:25:41 -08:00
TreeHugger Robot
1d78299027 Merge "Camera: Update constrained HFR VTS test." 2022-02-16 01:45:31 +00:00
Rucha Katakwar
18aa2d952b Camera: Update constrained HFR VTS test.
Added a check that HAL does not advertise multiple preview rates for
the same recording rate and size.

Bug: 200310682

Change-Id: Ia213f152ad00c846a533577e552b668efdde6f3d
2022-02-15 16:38:25 -08:00
Xin Li
0bf8f21279 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: Id9e06f88539b59480d5cf57a4ba67cef4676c1d5
Change-Id: Id6b1ea4f8700446b044255e80f21c137aeb7acf1
2022-02-11 07:27:13 +00:00
Bob Badour
13cb922a05 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  camera/common/aidl/Android.bp
  camera/device/aidl/Android.bp
  camera/metadata/aidl/Android.bp
  usb/aidl/Android.bp
  usb/aidl/default/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: Ie530a51faa37d782428a20238e78573658697be8
2022-02-10 13:39:55 -08:00
Jayant Chowdhary
198398724e Merge "Add stream use cases to camera aidl interfaces." 2022-02-07 19:51:15 +00:00
Jayant Chowdhary
9ca871ae24 Add stream use cases to camera aidl interfaces.
Bug: 196432585

Test: build

Change-Id: I1b2628056949d05aa553bdbba7983628ec54d65b
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-02-05 15:37:56 -08:00
Changyeon Jo
7853416a07 Camera: Add automotive metadata section
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.

Bug: 205156620
Test: m -j
Change-Id: Idc88d26a6834f30bbfd66d5a1ae74409dcf7b0dd
2022-02-04 19:54:51 -08:00
Shuzhen Wang
68ace478f1 Merge "Camera: Add stream use case API" 2022-02-05 03:13:08 +00:00
Jayant Chowdhary
0b0d7332f1 Add AIDL interface files for android.hardware.camera.common .
Bug: 196432585

Test: build; implementation will be submitted later.

Change-Id: Ic7577c557195464d9ef99506d8ceba172db14e0b
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-02-04 09:47:05 -08:00
Jayant Chowdhary
fd3b3c6c72 Add AIDL interfaces for camera device hal functionality.
Bug: 196432585

Test: build; Implementation will submitted later.

Change-Id: Ibc9477a6b088e85822087776e93e65f3243ea0bb
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-02-04 09:47:05 -08:00
Jayant Chowdhary
75aec9028a Add AIDL interfaces for camera HAL provider.
Bug: 196432585

Test: build; Implementation will be submitted later.

Change-Id: Ia50fe0502c811dddd706781c653f038e0415eb4d
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-02-04 09:47:03 -08:00