Commit Graph

341 Commits

Author SHA1 Message Date
Treehugger Robot
ed6abddaf8 Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577 am: 83a6256f38
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451

Change-Id: I2aa2077cffbbee18a0cd25acb46c3a8e0c4b6f14
2020-09-18 16:31:22 +00:00
NukemZHYu
5508e51c5c camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device
change (getCameraDeviceVersion(mProviderType, name) to (getCameraDeviceVersion(name, mProviderType)
Avoid Camera HAL 1 Device fail on Status(EX_TRANSACTION_FAILED): 'BAD_TYPE:

Bug: 168676352
Test: run commandAndExit vts -m VtsHalCameraProviderV2_5Target

Change-Id: Icb164538bbc357e22412a7320bb721c220c24a4c
2020-09-16 21:00:33 +00:00
TreeHugger Robot
c7ef8fe166 Merge "Camera HAL Vts : Fix usage flag combination during gralloc allocation." into stage-aosp-rvc-ts-dev am: 7cc876ee02 am: 314611d129
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12173503

Change-Id: I040deb56a223492e61eedce00464dbf94617aa88
2020-08-06 19:57:03 +00:00
Jayant Chowdhary
ef9374cb20 Camera HAL Vts : Fix usage flag combination during gralloc allocation.
Earlier, for processCaptureRequestInternal, we took into account
producer and consumer usage flags returned by configureSingleStream.
Instead we should be taking into account the producer flag returned by
configureSingleStream and the consumer flag passed into
processCaptureRequestInternal (for output streams).

Bug: 162344072

Test: Use secure camera as secure only camera and run vts
Test: Run camera vts
Test: Vendor testing

Change-Id: I9fbd4db4cff48c25684f097907e7ba995c3edf41
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-07-28 19:18:00 +00:00
Jooyung Han
d18cba85fe update hidl .bp
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
(cherry picked from commit b0907a6bb8)
2020-07-02 12:26:37 +09:00
TreeHugger Robot
59a28383f2 Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev am: ef7bf24010
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12036144

Change-Id: Iba10324055f76a2f7990194c078fabde735b4544
2020-06-30 18:14:05 +00:00
TreeHugger Robot
ef7bf24010 Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev 2020-06-30 18:01:02 +00:00
Yin-Chia Yeh
f65225671c Camera: fix the VTS test timeout to be 30min
Test: test failure is gone
Bug: 159413657
Change-Id: Id1a350081241910463614960c6fdda3d7e32eddc
2020-06-29 09:45:03 -07:00
TreeHugger Robot
7887470eca Merge "camera : Allow non bc camera devices through getConcurrentStreamingCameraIds" into rvc-dev am: f40dd0a7d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11975963

Change-Id: If33150977ba1a86745d56221b7272f2e948cff1d
2020-06-24 22:22:08 +00:00
Jayant Chowdhary
6a9a809e36 camera : Allow non bc camera devices through getConcurrentStreamingCameraIds
Also Add y16 stream combinations to configureConcurrentStreamsAvailableOutputs vts test

Bug: 159247271

Test: VtsHalCameraProviderV2_4TargetTest
      --gtest_filter=PerInstance/CameraHidlTest.configureConc* on
      cuttlefish

Change-Id: If5fea1fc47a3bcc8d3695e23f01a55091c246eda
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-06-24 12:42:49 -07:00
TreeHugger Robot
ec31161c48 Merge "Camera: Fix insensitive language in comments and names" into rvc-dev am: 7e5c3f0240
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11936022

Change-Id: Ie7223de56cc97de4cb6f6d358c8f2d448b44c257
2020-06-21 23:14:06 +00:00
TreeHugger Robot
7e5c3f0240 Merge "Camera: Fix insensitive language in comments and names" into rvc-dev 2020-06-21 22:53:20 +00:00
Eino-Ville Talvala
d6346872c6 Camera: Fix insensitive language in comments and names
Test: Builds
Bug: 159480149
Change-Id: Ic048071867b69e5c2d337f59f697980a6a64587f
2020-06-19 15:25:01 -07:00
TreeHugger Robot
06579d8b6e Merge "Camera: add new VTS test config file" into rvc-dev am: 0e6850ee68
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11813664

Change-Id: I92b7a6553644ba3336597595f46ded6d45795519
2020-06-12 18:31:09 +00:00
Yin-Chia Yeh
12ef3c9929 Camera: add new VTS test config file
The old config file is no longer being used. Adding new config
file that has the proper 30 minutes timeout.

Test: atest VtsHalCameraProviderV2_4TargetTest on Pixel 4
Bug: 156007290
Change-Id: I97b0fff967f87712f8f96ed06b628c70ad30dde4
2020-06-09 14:15:52 -07:00
Jayant Chowdhary
46a82de871 Merge changes from topic "vts-secure-only-camera" into rvc-dev am: ec37ce4947
Original change: undetermined

Change-Id: I7f99fe08f74082881ecdbe38daa8b21ebbc8dacd
2020-06-01 23:02:55 +00:00
Jayant Chowdhary
ec37ce4947 Merge changes from topic "vts-secure-only-camera" into rvc-dev
* changes:
  Camera VTS: Add a minimal test for secure only cameras.
  camera vts: Skip regular vts tests for secure only cameras.
2020-06-01 22:52:53 +00:00
Jayant Chowdhary
a80974ca8c Camera VTS: Add a minimal test for secure only cameras.
Bug: 156749607

Test: VtsHalCameraProviderV2_4TargetTest
      --gtest_filter=PerInstance/CameraHidlTest.processSecureCaptureRequest* on device which
      SECURE_IMAGE_DATA.

Change-Id: I57f6210b69b383dc4f43cc4ee8272050a0432541
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-06-01 12:15:58 -07:00
Jayant Chowdhary
83b724a23f camera vts: Skip regular vts tests for secure only cameras.
Bug: 156749607

Test: fake mark a camera id as a secure only, see that it doesn't get
      tested unless a test calls getCameraDeviceNames with addSecure = true

Test: VtsHalCameraProviderV2_4TargetTest passes on device without any secure only
      cameras

Change-Id: Ibe428b663bd8024f46f0273ed5dfaa108a90dd43
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-06-01 12:14:47 -07:00
TreeHugger Robot
a960704555 Merge "Camera: Allow maxDigitalZoom to be less than maxZoomRatio" into rvc-dev am: 25ff02b703
Change-Id: I81abe5918742929ebe7fd2d19415757d9f27d3e1
2020-05-27 21:36:38 +00:00
Shuzhen Wang
1d4e72f387 Camera: Allow maxDigitalZoom to be less than maxZoomRatio
For concurrent camera, we allow the maximum digital zoom to be smaller
than the maximum zoom ratio. Adjust VTS test accordingly.

Test: camera VTS test
Bug: 151891611
Change-Id: I1d3813ed93faa83689dcb6a83490fae5581c602f
2020-05-27 12:04:38 -07:00
Suren Baghdasaryan
608059a6bc Replace direct pid writes with setting task profiles for camera interfaces
For easy transition from SchedTune to UtilClamp, direct access to these
cgroups should be abstracted by using task profiles. Replace writepid
commands with new task_profiles command.

Bug: 155419956
Test: change .rc file and confirm task profile is applied
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I2732f7365351f132dbf0566319e3969c2a25b3e4
Merged-In: I2732f7365351f132dbf0566319e3969c2a25b3e4
2020-05-02 00:34:24 +00:00
Suren Baghdasaryan
52d1ce7048 Replace direct pid writes with setting task profiles for camera interfaces am: 849e9fc8b6 am: 264676daab
Change-Id: Ibc8b17e63a69f2b3da09af60465f692d22627cae
2020-05-01 17:03:57 +00:00
Suren Baghdasaryan
849e9fc8b6 Replace direct pid writes with setting task profiles for camera interfaces
For easy transition from SchedTune to UtilClamp, direct access to these
cgroups should be abstracted by using task profiles. Replace writepid
commands with new task_profiles command.

Bug: 155419956
Test: change .rc file and confirm task profile is applied
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I2732f7365351f132dbf0566319e3969c2a25b3e4
2020-04-30 13:45:23 -07:00
TreeHugger Robot
740f84aaef Merge "vts camera characteristtics: add tests for system camera restrictions." into rvc-dev am: 253be8a6b4
Change-Id: I0b3b23dc80ee32fa8c5614490887c0f349c3319e
2020-04-28 19:30:48 +00:00
TreeHugger Robot
253be8a6b4 Merge "vts camera characteristtics: add tests for system camera restrictions." into rvc-dev 2020-04-28 19:18:34 +00:00
Jayant Chowdhary
7612f161a7 vts camera characteristtics: add tests for system camera restrictions.
The system camera kind of physical cameras which are public, should be the same as the
system camera kind of the logical cameras they back.

The system camera kinds of all logical cameras that share the same
hidden physical cameras must be the same.

Bug: 152053830

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

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

Change-Id: Iba07a6aa4a5fb465e9e0c4d0adedf6becaba7d14
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-04-28 10:32:06 -07:00
Dan Shi
aad51fa000 Rename vts-core to vts
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL update suite name vts-core to vts as
the suite name is updated. This CL won't change test logic or behavior.

Change-Id: I562b4dc50765e953800a814a8fd84a01c1b9352b
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-04-07 16:37:40 -07:00
Shuzhen Wang
3803c1970f Camera: Migrate BOKEH_MODE to EXTENDED_SCENE_MODE am: acf026ec78
Change-Id: I216a46285b8c67b230f890a58171fce0a4771d3a
2020-03-21 04:40:36 +00:00
TreeHugger Robot
ed52cf6f83 Merge "Camera: Migrate BOKEH_MODE to EXTENDED_SCENE_MODE" into rvc-dev 2020-03-21 04:25:09 +00:00
Shuzhen Wang
acf026ec78 Camera: Migrate BOKEH_MODE to EXTENDED_SCENE_MODE
Migrate BOKEH_MODE_STILL_CAPTURE and BOKEH_MODE_CONTINUOUS to be 2 enums
of CONTROL_EXTENDED_SCENE_MODE.

Test: VtsHalCameraProviderV2_4TargetTest
Bug: 151759402
Change-Id: I4ee88ab550902edadbd8dc446677c5a02ea582cb
2020-03-19 09:49:03 -07:00
Anton D. Kachalov
34cdbcde50 Camera: Advertise numbered string ID for external cameras
With current implementation cameraId is part of something like:

  device@3.5/external//dev/video0

This doesn't work well with Camera2 API based apps.

Adding CameraIdOffset tag to Provider as a base offset.

Test: presubmit builds
Bug: 151350336

Merged-In: I6309d16be565616f048fb24a70e9be5b2f5ed480
Change-Id: I6309d16be565616f048fb24a70e9be5b2f5ed480
(cherry picked from commit 4f6022ae5d)
2020-03-12 21:21:09 +00:00
Jayant Chowdhary
7d69fc8ffa camera: Add more VTS tests for ICameraProvider@2.6
Add initial test exercising getConcurrentStreamingCameraIds() and
isConcurrentSessionConfigurationSupported()

Bug : 148180006

Test: VtsHalCameraProviderV2_4TargetTest --gtest_filter=PerInstance/CameraHidlTest.configureConc*
      on cuttlefish

Change-Id: If3821ba5452d487e9a0d83d01e2da86ddf509b50
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-03-02 00:15:00 -08:00
Emilian Peev
f0aa3f0107 Camera: Add ICameraDevice@3.6 subinterface
Camera device subinterface version 3.6 must inherit
from the previous version 3.5 and continue to support
device sessions with versions 3.2, 3.5 as well as the
most recent 3.6.

Bug: 148235329
Test: VtsHalCameraProviderV2_4TargetTest
--gtest_filter=PerInstance/CameraHidlTest.switchToOffline/0_external_0

Change-Id: Ia46cbd771eb1d2624cc0cee808a3eb074fc775b6
2020-02-04 10:12:15 -08:00
Yin-Chia Yeh
64479a583b Merge changes from topic "OfflineReproc-impl-tests"
* changes:
  Camera: fix offline processing VTS/CTS
  Camera: Verify offline session behavior in VTS
2020-02-04 17:52:00 +00:00
Yin-Chia Yeh
97978fbe32 Camera: fix offline processing VTS/CTS
Test: camera VTS test + add manual delay to webcam HAL output thread
      so there will be some requests left for offline processing
      camera CTS OfflineSessionTest
Bug: 135142453
Change-Id: If5718350707ef051f96b96da75f934089b10467d
2020-02-03 10:30:05 -08:00
Emilian Peev
9ab6b3eb3e Camera: Verify offline session behavior in VTS
Camera offline sessions can be used as way to
free up and share camera resources. Check that
the corresponding HIDL API behaves as per
documentation.

Bug: 135142453
Test: adb shell /system/bin/VtsHalCameraProviderV2_4TargetTest
--hal_service_instance=android.hardware.camera.provider@2.4::ICameraProvider/internal/0

Change-Id: I5b714061894eb2b0179a44dcedf81b0155fb4b54
2020-02-03 10:29:45 -08:00
TreeHugger Robot
cd3f355937 Merge "Camera: add webcam HAL@3.6 support" 2020-01-30 23:10:52 +00:00
Yin-Chia Yeh
4da7c6c997 Camera: add webcam HAL@3.6 support
First CL to setup webcam HAL to support HIDL camera device 3.6.
Follow up CL will add actual offline processing capability.

Test: TestingCamera.apk
Bug: 135142453
Change-Id: Ifcd1b22f42d08b0fa5dc6039125c1d979b8104c2
2020-01-29 11:22:20 -08:00
Shuzhen Wang
05066109ff Camera: Add ICameraProviderCallback version 2.6
The new version adds callback for physical sub-camera status callback.

Test: VtsHalCameraProviderV2_4TargetTest --hal_service_instance=android.hardware.camera.provider@2.6::ICameraProvider/internal/1
Bug: 119325027
Change-Id: I8148f6c55f80d7f4092d2fe5ccf92509bb8c069d
2020-01-23 10:47:54 -08:00
Shuzhen Wang
c5ae069c79 Camera: Add new pose reference value UNDEFINED
If a camera device's location/orientation changes due to user action
(such as phone fold/unfold), its pose reference can be set to UNDEFINED.

Bug: 119325027
Test: VtsHalCameraProviderV2_4TargetTest
Change-Id: I227be31db64db049a8fad57e6765e1b6e025529a
2020-01-15 11:09:26 -08:00
Shuzhen Wang
6856ca7650 Camera: Add support for CONTROL_ZOOM_RATIO
- The new zoom API combines optical and digital zoom, and supports both
zoom-out and zoom-in with more precision.
- Support separate zoom range for different bokeh modes.

Test: Camera vts test
Bug: 130025314
Change-Id: I67e0fac281a81d54f8828456c2f36df56be1803f
2019-12-18 11:36:08 -08:00
TreeHugger Robot
7df41c1a9d Merge "[vts-core] add VtsHalCameraProviderV2_4TargetTest to vts-core" 2019-12-12 03:34:00 +00:00
Marissa Wall
3b6cfe061e camera-vts: don't import gralloc buffer after allocating
Before moving to GraphicBufferAllocator, the test just allocated
the buffer. GraphicBufferAllocator allocates and imports the buffer.
Update the test to only allocate the buffer.

Bug: 145941038
Test: VtsHalCameraProviderV2_4TargetTest

Change-Id: Ib3801d06265836eec2875f13ae6f2ec070d7d353
2019-12-11 20:49:37 +00:00
nelsonli
b7287d2e79 [vts-core] add VtsHalCameraProviderV2_4TargetTest to vts-core
Convert VtsHalCameraProviderV2_4TargetTest to be parameterized test
and add it to vts-core

Bug: 142397658
Test: $atest VtsHalCameraProviderV2_4TargetTest
Change-Id: I76b20be8ef18dadc4fc5d10db5c541aadf3b9b18
2019-12-10 14:15:47 +08:00
Marissa Wall
da54091640 gralloc: move VtsHalCameraProviderV2_4TargetTest to GraphicBufferAllocator/Mapper
libui's GraphicBufferAllocator/Mapper already wrap the different
gralloc functions and hide the details from the caller. There is no
reason VtsHalCameraProviderV2_4TargetTest needs to directly talk to
gralloc. This patch updates VtsHalCameraProviderV2_4TargetTest to
use libui.

Bug: 145139476
Test: adb shell /system/bin/VtsHalCameraProviderV2_4TargetTest
--hal_service_instance=android.hardware.camera.provider@2.4::ICameraProvider/internal/0

Change-Id: I2c2a913f6c5aea2ce7260b68293df404f40e0ddd
2019-11-26 09:43:04 -08:00
Emilian Peev
bbf5959db6 Camera: Signal when all Hal requested buffers return
Depending on timing 'waitForBuffersReturned' can be
called before all Hal requested buffer are able to return.
To avoid potential timeout, check for any outstanding buffers
and signal accordingly before returning from 'returnStreamBuffers'.

Bug: 144308932
Test: adb shell /system/bin/VtsHalCameraProviderV2_4TargetTest
--hal_service_instance=android.hardware.camera.provider@2.4::ICameraProvider/internal/0

Change-Id: Idb3d8bd6fdbdfe0798c38a1b83c17f1a8379738e
2019-11-12 17:27:00 -08:00
TreeHugger Robot
0b93288c77 Merge "gralloc: name buffer at allocation time" 2019-11-07 23:13:21 +00:00
Marissa Wall
bf9f6d39ed gralloc: name buffer at allocation time
Allow the client to name their buffer at allocation time.

b/141632767 will let the client(s) query the name of the
buffer later.

Bug: 144026910
Test: VtsHalGraphicsMapperV4_0TargetTest

Change-Id: Ib08c1909c10a1778c50b59e0a42ddf19140d8f03
2019-11-07 11:46:58 -08:00
Shuzhen Wang
07ccc7a17e Camera: Add bokeh mode tags in camera metadata
Introduce new bokeh mode metadata tags for camera device to enable bokeh
effect.

Test: Build and read docs
Bug: 118258123
Change-Id: I99b85fe60ee8af008592922ae2cce64be33e88a2
2019-10-29 17:18:16 -07:00