Commit Graph

696 Commits

Author SHA1 Message Date
Jayant Chowdhary
db10799329 Merge changes from topic "vts-secure-only-camera" into rvc-dev am: ec37ce4947 am: 1487a9ebb3
Original change: undetermined

Change-Id: I7428b76dc741998cd79ec4a457e4c37b0d2521fd
2020-06-01 23:17:24 +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
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
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
TreeHugger Robot
6ad97556cf Merge "Camera: Update metadata docs to match current API" into rvc-dev am: 42b7037739
Change-Id: Ide8dc0cf713e0d8aa246d670922f0003c179b585
2020-03-24 18:56:04 +00:00
TreeHugger Robot
42b7037739 Merge "Camera: Update metadata docs to match current API" into rvc-dev 2020-03-24 18:41:45 +00:00
Jayant Chowdhary
3f59f7aa1c Merge "Clarify getConcurrentStreamingCameraids may return hidden physical camera ids as well." into rvc-dev am: 9b56a5a538
Change-Id: I569f0e42b0eb3e7a677528c591032d35bbaa2a11
2020-03-23 03:18:02 +00:00
Jayant Chowdhary
9b56a5a538 Merge "Clarify getConcurrentStreamingCameraids may return hidden physical camera ids as well." into rvc-dev 2020-03-23 03:01:23 +00: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
Jayant Chowdhary
61c3ac2a69 Clarify getConcurrentStreamingCameraids may return hidden physical camera ids as well.
Bug: 151891611

Test: builds

Change-Id: I889065b379d9966e9cc8a225fb335685f2f065cd
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-03-20 16:25:05 -07:00
Eino-Ville Talvala
4befcfdddb Camera: Update metadata docs to match current API
Test: Builds
Bug: 150036107
Change-Id: I3e5321e91458d980ad96d3665d9f11bbafb047f1
2020-03-20 15:42:16 -07:00
TreeHugger Robot
19d25d08aa Merge "Camera: Avoid adding uninitialized hal requests" into rvc-dev am: 104fe8332f
Change-Id: Id06c238c7e656b94f87aae6596edaee1367dd1cf
2020-03-20 18:17:44 +00:00
TreeHugger Robot
104fe8332f Merge "Camera: Avoid adding uninitialized hal requests" into rvc-dev 2020-03-20 17:59:15 +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
TreeHugger Robot
211533c556 Merge "Camera: Advertise numbered string ID for external cameras" into rvc-dev am: 7bf05d75bc
Change-Id: Ie249d2be0b955cfae416672df52e78aea3483d63
2020-03-18 21:52:15 +00: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
Automerger Merge Worker
8fe3efb604 Merge "Fix bugprone-use-after-move warnings" am: 1c7e676905 am: e59bd9e1a7
Change-Id: Ib55852613336c4def111922b010f938fa7eec14b
2020-03-10 17:47:10 +00:00
Automerger Merge Worker
ec4685de6c Merge "Fix bugprone-use-after-move warnings" am: 1c7e676905 am: e59bd9e1a7
Change-Id: Ifbbdf54efe22128725600f5da4956547fe5871cf
2020-03-10 17:47:01 +00:00
Chih-Hung Hsieh
ba3a1cb529 Fix bugprone-use-after-move warnings
Bug: 150783499
Test: WITH_TIDY=1 make
Change-Id: If257532523674ea6256b72ec765904a8de5bf565
2020-03-05 15:30:00 -08:00
Automerger Merge Worker
5d8f353ad6 Camera: Fix possible ExifUtils heap corruption am: aa5673385a am: 711ebe64dd am: f4481c4d98
Change-Id: Id9341512a4c547abd532bb96d70f9ac50cb1745c
2020-03-04 18:29:33 +00:00
Automerger Merge Worker
098aae3c96 Camera: Fix possible ExifUtils heap corruption am: aa5673385a am: 711ebe64dd am: f4481c4d98
Change-Id: I4b5e0308f7a5af5e0aaa4b85e458f0e90b4fac7b
2020-03-04 18:28:55 +00:00
Automerger Merge Worker
711ebe64dd Camera: Fix possible ExifUtils heap corruption am: aa5673385a
Change-Id: I209742be498ea65b6763cf673514e74241b75717
2020-03-04 17:58:31 +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
36aa827f70 Camera: Avoid adding uninitialized hal requests
The offline requests deque is constructed with
specific amount of entries. Initialize the
the already allocated entries before pushing
new ones.

Bug: 149346795
Test: Camera CTS
Change-Id: I6db8d48949caf753429702b60c48698c95ecf4ad
2020-02-26 16:41:57 -08:00
Jayant Chowdhary
6ae828b6f0 ICameraProvider@2.6: Add documentation about resource cost constraints for concurrent camera combinations.
- Also clarify requirements for MONOCHROME devices supporting Y8 outputs.

Bug: 150225538

Test: builds (doc change only)

Change-Id: I992f1bcee4bf266b6e66ddb32ece8291381c8e56
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-02-26 22:44:00 +00:00