Commit Graph

480 Commits

Author SHA1 Message Date
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
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
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
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
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
Jooyung Han
5527adfd7f 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
Change-Id: If999df9c78a20df931177da11742b1c5de19bc08
2022-06-02 17:43:19 +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
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
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
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
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
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
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
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
Shuzhen Wang
68ace478f1 Merge "Camera: Add stream use case API" 2022-02-05 03:13:08 +00: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
Shuzhen Wang
7267abff25 Camera: Add stream use case API
- Add availableStreamUseCase static metadata tag
- Add STREAM_USE_CASE camera capability
- Add useCase flag in camera stream interface

Test: atest VtsHalCameraProviderV2_4TargetTest
Bug: 200307880
Change-Id: I4e473edcb52a97fa0e1b27cf94603cf9f9984f82
2022-02-03 17:46:44 -08:00
Greg Kaiser
754fcb8c33 Avoid multiple map lookups
We directly use erase(), and its return value, so we only need
to look up 'deviceName' once.

Test: TreeHugger
Bug: 191248460
Change-Id: I7c229e7d1de5f76071f55f965eab447b6c868bcc
2022-01-21 07:00:25 -08:00
Iavor-Valentin Iftime
cd3e66327f Merge "Add external lazy camera provider 2.7" 2022-01-20 16:48:21 +00:00
Shuzhen Wang
1320f88af2 Camera: VTS: Remove GRF MultiCamera for Android 12
Certain OEMs' new S launches with vendor freeze cannot implement
multi-camera API.

Bug: 189053514
Bug: 211709637
Change-Id: I71b46f1e8343a5848cbe3fa55bbcd427c87b05dd
Merged-In: I71b46f1e8343a5848cbe3fa55bbcd427c87b05dd
(cherry picked from commit 30a198ded0)
2022-01-20 05:50:37 +00:00
TreeHugger Robot
714f9596c3 Merge "Camera: VTS: Remove GRF MultiCamera for Android 12" 2022-01-20 05:49:39 +00:00
Shuzhen Wang
ea3ab4f3f3 Camera: VTS: Remove GRF MultiCamera for Android 12
Certain OEMs' new S launches with vendor freeze cannot implement
multi-camera API.

Test: Build
Bug: 189053514
Bug: 211709637
Change-Id: I71b46f1e8343a5848cbe3fa55bbcd427c87b05dd
(cherry picked from commit 30a198ded0)
2022-01-19 13:21:42 -08:00
Emilian Peev
b5f634fc37 Camera: Add device 3.8 and HDR10 native APIs
Initial set of native API extensions to support 10-bit
output capable device:
- Identification
- Configuration
- Data plumbing

Bug: 195946346
Test: adb shell
/data/nativetest64/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest
--gtest_filter=PerInstance/CameraHidlTest.process10BitDynamicRangeRequest/0_internal_0

Change-Id: I526120944232ce211259cbd215935db7e445a6c5
2022-01-05 15:46:50 -08:00
Jayant Chowdhary
c40bae7dc8 Merge "VTS test for previewStabilization" 2021-12-29 19:52:56 +00:00
Valentin Iftime
23d32a1fc3 Add external lazy camera provider 2.7
Add default implementation for external camera
 provider with lazy HAL support v2.7.

 Test configuration for devices:
 PRODUCT_PACKAGES += android.hardware.camera.provider@2.7-impl
 PRODUCT_PACKAGES += android.hardware.camera.provider@2.7-external-service-lazy
 PRODUCT_PROPERTY_OVERRIDES += ro.camera.enableLazyHal=true

Test: atest CtsCameraTestCases
      atest VtsHalCameraProviderV2_4TargetTest

Bug: 191248460

Change-Id: I57c8130d7c331028eff35dc68e360fdd8d8c32e2
2021-12-27 18:59:47 +01:00
Jayant Chowdhary
bf39d4db34 VTS test for previewStabilization
Bug: 200197440

Test: VtsHalCameraProviderV2_4TargetTest
     --gtest_filter=PerInstance/CameraHidlTest.processCaptureRequestPreviewStab*

Change-Id: Iba71983a69d20af605924fa6f1c0697e49d911f8
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-12-15 14:41:03 -08:00
Rucha Katakwar
5ad93755c8 Camera: Add 3.8 version of ICameraDevice.
The new version of ICameraDevice supports interfaces for torch
strength control feature. New VTS test has been added to test the
emulator HAL-side implementation of the newly added interfaces.

bug: 200174275

Test: Camera VTS test pass.
Change-Id: Ia5652a96e09bd716b5079fe9ed071dffc53b5b12
2021-12-13 12:02:51 -08:00
Shuzhen Wang
8136c00c7e Camera: Update readoutTimeout requirement
Due to sensor crop, readoutTimeout - startOfExposure may be larger than
exposureTime. Update the VTS test to reflect the spec change.

Test: processCaptureRequestPreview
Bug: 208270993
Change-Id: I51a373ecbc5c7c086f84c5479a43dffbe8fcc0c2
2021-12-01 18:34:03 -08:00
Shuzhen Wang
cd9af6c1ce Camera: Add version 3.8 of ICameraDeviceCallback
The new version of ICameraDeviceCallback supports shutter notify with readout
timestamp.

The readout timestamp is used to re-time viewfinder frames to reduce
jitter. When camera runs at fixed frame rate, the start_of_exposure time
intervals may change, but start_or_readout intervals are constant.

Test: Camera VTS test
Bug: 189380857
Change-Id: I4c3856a4e30caa8cdf8417d437de1de3190c6fd6
2021-11-17 13:48:10 -08:00