Commit graph

721 commits

Author SHA1 Message Date
Dan Shi
2fdd0c5c39 Rename vts-core to vts
Bug: 151896491
Test: none
Change-Id: If74547c56b46ebc7fd728c1bf52fe9dedac65ffa
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-09-29 06:52:28 +00:00
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
8d3c76bf85 Merge "Camera: Allow HAL not call notify() with ERROR_BUFFER" into rvc-dev am: 3de961d7bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11906338

Change-Id: I73b11cbf5e3a71d7c6ef699233a15444573ed0e3
2020-06-18 22:16:16 +00:00
Shuzhen Wang
ce9d001076 Camera: Allow HAL not call notify() with ERROR_BUFFER
The new framework implementation derives capture buffer loss
notification from other information, and treats HAL notify() with
ERROR_BUFFER as no-op.

Test: Build
Bug: 155353799
Change-Id: Ia7ea52ee2750c7404b657467e1cfda4c05e6cc78
2020-06-17 23:34:16 -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
TreeHugger Robot
0e6850ee68 Merge "Camera: add new VTS test config file" into rvc-dev 2020-06-12 18:09:29 +00:00
Jayant Chowdhary
4a8fd32ef2 Merge "Add some updates to documentation regarding concurrent camera operation." into rvc-dev am: 416e3d94f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11832204

Change-Id: Ifcac52d68b3d3909b64d17ae05ec91778152ebcd
2020-06-11 20:42:06 +00:00
Jayant Chowdhary
416e3d94f9 Merge "Add some updates to documentation regarding concurrent camera operation." into rvc-dev 2020-06-11 20:25:10 +00:00
Jayant Chowdhary
ed8ec83813 Add some updates to documentation regarding concurrent camera operation.
- Add documentation about giving hints to camera HAL about concurrent
  operation before configuring sessions

- Limitations on ZOOM_RATIO_RANGE during concurrent operation.

Bug: 151891611

Test: builds

Change-Id: I79d0bd8be1ed9aa29a1ba080d01833f16eff580c
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-06-10 20:07:07 -07: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
Shuzhen Wang
2d58ef67de Merge "Camera: Clarify ERROR_REQUEST callback" into rvc-dev am: ee71769ebc
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11689356

Change-Id: Ie4e22c25aaa119a91901a559e438063d86ebaf55
2020-06-08 19:21:09 +00:00
Shuzhen Wang
ee71769ebc Merge "Camera: Clarify ERROR_REQUEST callback" into rvc-dev 2020-06-08 19:07:04 +00: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
Shuzhen Wang
643dd41944 Camera: Clarify ERROR_REQUEST callback
Allow partial result to be generated in the case of ERROR_REQUEST.

Test: Build
Bug: 155353799
Change-Id: I6ade958cac773e854d669aec3caf99191a875ec7
2020-06-01 12:28:28 -07: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
Jason Macnak
125ccb95ee Merge "Implement lockYCbCr stub for Mapper 4.0" into rvc-dev am: 2540a38771
Change-Id: Ia78155463d85f6d3cb1b0003589cfdf3abf9426e
2020-05-15 15:54:35 +00:00
Eino-Ville Talvala
4f03969e11 Merge "Camera: Update documentation for rolling shutter skew" into rvc-dev am: 6d9c200198
Change-Id: Ic3c20086cec1c58e47941206b42d78913cd13375
2020-05-15 15:53:59 +00:00
Jason Macnak
2540a38771 Merge "Implement lockYCbCr stub for Mapper 4.0" into rvc-dev 2020-05-14 21:06:54 +00:00
Eino-Ville Talvala
6d9c200198 Merge "Camera: Update documentation for rolling shutter skew" into rvc-dev 2020-05-14 16:49:42 +00:00
Eino-Ville Talvala
34bb3064fe Camera: Update documentation for rolling shutter skew
Existing definition was inconsistent, so update it to be consistent
and match what implementations have actually done.

Test: Builds
Bug: 150331548
Change-Id: I5dfbe7c802bf4ac98f0c5556d5ac3af5d79cff7a
2020-05-13 21:13:20 +00:00
Jason Macnak
5a48860817 Merge "Adds a lock method to HandleImporter w/ access region" into rvc-dev am: 26b2e0b708
Change-Id: I13915559610aa2f4813efca4bf99fd2946f96cbb
2020-05-12 20:57:22 +00:00
Jason Macnak
eda6dca45c Implement lockYCbCr stub for Mapper 4.0
(Includes bpfmt changes from repo hook)

Bug: b/146515640
Test: cts -m CtsCameraTestCases
Change-Id: Ibd882db1883e0976c2baf95257e51c29de6e6853
2020-05-12 11:40:20 -07:00
Jason Macnak
f2c9ed1309 Adds a lock method to HandleImporter w/ access region
... to allow locking 2D regions of non-BLOB buffers.

Bug: b/146515640
Test: cts -m CtsCameraTestCases
Change-Id: Ia68abf96ffe15891520833921e103efa3f7a80c5
2020-05-12 11:33:55 -07:00
TreeHugger Robot
488ea65049 Merge "Camera: move preCorrectionActiveArraySize override to cameraserver" into rvc-dev am: 7b938e3471
Change-Id: I853ec94ee01b58a4be2a4afd53371b06bacc48e6
2020-05-04 05:44:00 +00:00
TreeHugger Robot
7b938e3471 Merge "Camera: move preCorrectionActiveArraySize override to cameraserver" into rvc-dev 2020-05-04 05:28:39 +00: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
Shuzhen Wang
75b0f0288c Camera: move preCorrectionActiveArraySize override to cameraserver
This is to handle the case where HAL isn't using the hidl shim.

Test: dumpsys on Pixel 2
Bug: 145300768
Change-Id: I74874a025904887cc27ec00518f4261dd24e291a
2020-05-01 11:59:10 -07: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
264676daab Replace direct pid writes with setting task profiles for camera interfaces am: 849e9fc8b6
Change-Id: I65da7a5b8636ea6677ab6820922bb5b18e5ff654
2020-05-01 16:49:32 +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
Tom Cherry
a3a2e9c664 Include what you use: <fcntl.h> am: 10256e3ad8 am: bbf78ea50d
Change-Id: Id497f81dc9bfe8d5d5bd138e903119bbeb8e328c
2020-04-13 19:56:08 +00:00