Commit Graph

1073 Commits

Author SHA1 Message Date
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
419d3b8fd8 Merge "Camera: Clarify ERROR_REQUEST callback" into rvc-dev am: ee71769ebc am: 2d58ef67de am: 8511acbc84 am: 29ef321787
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11689356

Change-Id: Ib1453f5e234b20ed604d40f2d6d10d19d16de11a
2020-06-08 19:58:15 +00: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
eaa7a7e0da Merge changes from topic "vts-secure-only-camera" into rvc-dev am: ec37ce4947 am: 1487a9ebb3 am: acc8d9c7ce am: 2d71ac4ea6
Original change: undetermined

Change-Id: I275116cd0a751467375866af68f5149c927eebf9
2020-06-01 23:50:43 +00:00
Jayant Chowdhary
2d71ac4ea6 Merge changes from topic "vts-secure-only-camera" into rvc-dev am: ec37ce4947 am: 1487a9ebb3 am: acc8d9c7ce
Original change: undetermined

Change-Id: Ie8ac640400e1de5c129cadff1b3e87936e582002
2020-06-01 23:34:43 +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
328f3c8871 Merge "Camera: Allow maxDigitalZoom to be less than maxZoomRatio" into rvc-dev am: 25ff02b703 am: 60747b7823 am: 6ec7a4846d am: 75bef4391f
Change-Id: I30cc9af1199ddc9e7cd851c77dff043d04d39734
2020-05-27 22:21:12 +00:00
TreeHugger Robot
75bef4391f Merge "Camera: Allow maxDigitalZoom to be less than maxZoomRatio" into rvc-dev am: 25ff02b703 am: 60747b7823 am: 6ec7a4846d
Change-Id: Ie7a5b01c3b48bd57d09eb7df05669fa2fe3fd277
2020-05-27 22:04:27 +00: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
382c0dc077 Merge "Implement lockYCbCr stub for Mapper 4.0" into rvc-dev am: 2540a38771 am: 6313157f6b am: 79836771da am: 49c442cf03
Change-Id: I27637bdf3bbcdf6d140668c26552ae51a83d6463
2020-05-15 16:09:13 +00:00
Eino-Ville Talvala
03362e43d6 Merge "Camera: Update documentation for rolling shutter skew" into rvc-dev am: 6d9c200198 am: 907694dc34 am: d24634cb43 am: 8894d2ab30
Change-Id: Ibd848580abec0adf26f83f673238aebe382f26da
2020-05-15 16:08:39 +00: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
49c442cf03 Merge "Implement lockYCbCr stub for Mapper 4.0" into rvc-dev am: 2540a38771 am: 6313157f6b am: 79836771da
Change-Id: I70adc55711ef4d13174dd1c72cd49dfff3202803
2020-05-15 15:51:31 +00:00
Eino-Ville Talvala
8894d2ab30 Merge "Camera: Update documentation for rolling shutter skew" into rvc-dev am: 6d9c200198 am: 907694dc34 am: d24634cb43
Change-Id: I6e22ffbcbae9f3746ad72bc52b41796c350518ce
2020-05-15 15:49:57 +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
2168cda03c Merge "Adds a lock method to HandleImporter w/ access region" into rvc-dev am: 26b2e0b708 am: ae7d2186e8 am: b76ffdeccf am: 557e1b6cb0
Change-Id: I0315739a64a11c1ca2e4a52530a39713025d9a99
2020-05-12 22:58:43 +00:00
Jason Macnak
b76ffdeccf Merge "Adds a lock method to HandleImporter w/ access region" into rvc-dev am: 26b2e0b708 am: ae7d2186e8
Change-Id: I2ffe034e964e86e8ae666c093ae2278ee3d5c33d
2020-05-12 21:01:37 +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
054b6c788c Merge "Camera: move preCorrectionActiveArraySize override to cameraserver" into rvc-dev am: 7b938e3471 am: efe82e7dfc am: ff08b2c335 am: bf10f566be
Change-Id: I9d9e0791438103e3db01a2db41ff3f7dd8176e12
2020-05-04 06:23:55 +00:00
TreeHugger Robot
ff08b2c335 Merge "Camera: move preCorrectionActiveArraySize override to cameraserver" into rvc-dev am: 7b938e3471 am: efe82e7dfc
Change-Id: I78f0254ae0b372baff14c3cfe50854028c16608e
2020-05-04 05:53:14 +00: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
d6bf69dc9c Replace direct pid writes with setting task profiles for camera interfaces am: 849e9fc8b6 am: 264676daab am: 52d1ce7048 am: c96f32f908 am: 5379a9dcde
Change-Id: I0b4a60a06fe349483f1371389c2b0f5d8e106adb
2020-05-01 17:33:34 +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
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
32cd27eb2f Merge "vts camera characteristtics: add tests for system camera restrictions." into rvc-dev am: 253be8a6b4 am: d35cbc1058 am: e6fe95ad85 am: 0f484be74c
Change-Id: Ib629b974c40a9f1c546e7041d62d8f80a4c70e0f
2020-04-28 20:24:29 +00:00
TreeHugger Robot
e6fe95ad85 Merge "vts camera characteristtics: add tests for system camera restrictions." into rvc-dev am: 253be8a6b4 am: d35cbc1058
Change-Id: I86a6b22cd9c4397d449cde3a831e2dd2463f3ab5
2020-04-28 19:52:05 +00: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
ebd35b4562 Include what you use: <fcntl.h> am: 10256e3ad8 am: bbf78ea50d am: a3a2e9c664 am: 336ba5e799 am: 9184fa2d43
Change-Id: Iab11ec9a80bda7aefc0c8b2d23a3873d3fba6043
2020-04-13 21:13:52 +00: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
Tom Cherry
bbf78ea50d Include what you use: <fcntl.h> am: 10256e3ad8
Change-Id: I29ee59072bc9157c907f93db17c64d6d9e33c256
2020-04-13 19:37:11 +00:00
Tom Cherry
10256e3ad8 Include what you use: <fcntl.h>
This was transitively included, but no longer is, so it must be
explicitly included.

Exempt-From-Owner-Approval: Janitorial
Test: build
Change-Id: I48d318c53cbfb76849f987029b0c8e775f576496
2020-04-13 11:09:42 -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
Dan Shi
3a8a650c61 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
2020-04-07 18:03:49 +00:00