Commit graph

926 commits

Author SHA1 Message Date
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
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
TreeHugger Robot
c0909faaa3 Merge "Camera: Update metadata docs to match current API" into rvc-dev am: 42b7037739 am: e1ff41dbe1
Change-Id: I366f9ff91b426d29a3242ec1f7feebb0a22a9c93
2020-03-24 19:05:28 +00: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
3f771f3a7e Merge "Clarify getConcurrentStreamingCameraids may return hidden physical camera ids as well." into rvc-dev am: 9b56a5a538 am: 4711132d0d
Change-Id: I4ea1dcd869fdf4d2c820c507e6a92ba3a302fcbf
2020-03-23 03:34:18 +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
013ae8eba4 Camera: Migrate BOKEH_MODE to EXTENDED_SCENE_MODE am: acf026ec78 am: 48e41d4863
Change-Id: Ia382190620e2d34cdc0b79bb74d8abe9fc5a712c
2020-03-21 05:02:03 +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
Shuzhen Wang
48e41d4863 Camera: Migrate BOKEH_MODE to EXTENDED_SCENE_MODE am: acf026ec78
Change-Id: I60d1ad7cc1d5dc5ce816d549efb2d75754a6a6c2
2020-03-21 04:40:13 +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
806cd29563 Merge "Camera: Avoid adding uninitialized hal requests" into rvc-dev am: 104fe8332f am: f193aa7ffb
Change-Id: I505c9de4f40708d2a63b66981a052d3d5ada8e22
2020-03-20 18:38:23 +00: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
Yin-Chia Yeh
6e082e8581 Camera: clarify depth camera requirement for OFFLINE_PROCESSING
Test: build (doc only change)
Bug: 135142453
Change-Id: I48589e6f7fad6ff291a57de305b4a549dbb843b2
2020-02-20 22:44:27 +00:00
Jayant Chowdhary
3a0030faab ICameraProvider@2.6 : Update documentation for getConcurrentStreamingCameraIds.
Bug: 148995918

Test: builds

Change-Id: I89df3be9e15881e081b76d6c0312bc54da931dea
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-02-19 14:16:44 -08:00
Jayant Chowdhary
653ea6c323 ICameraProvider@2.6: Update mandatory concurrent stream combinations.
Bug: 77960042

Test: builds

Change-Id: Ic56d6a10ee3521901aae5d8e7289dead7c20b086
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-02-19 13:36:39 -08:00
Emilian Peev
aa5673385a Camera: Fix possible ExifUtils heap corruption
Both EXIF_TAG_IMAGE_WIDTH and EXIF_TAG_IMAGE_LENGTH
expect short values as per EXIF spec. Call appropriate
libexif function to avoid possible heap corruption.

Bug: 148223871
Test: Successful build
Change-Id: Ib16bf1ae8ab2093da529efe6ff0778331c3e9eb3
2020-02-18 10:20:02 -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
TreeHugger Robot
4aff0ab86f Merge "Camera: add webcam offline processing support" 2020-02-03 19:40:26 +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
Yin-Chia Yeh
5dab7280b3 Camera: add webcam offline processing support
Test: CTS/VTS in follow up changes
Bug: 135142453
Change-Id: Ie95f22795f4807ed384443de0fffc65c5dde16d1
2020-02-03 10:09:56 -08:00
Paul Chen
17859d49aa Revert "Camera: add webcam offline processing support"
This reverts commit 7f2ce25f64.

Reason for revert: aosp_x86-userdebug build break

Change-Id: Ie8ad10066ae5c473e183d930ab03e63b61a2dd75
2020-01-31 11:23:26 +00:00
TreeHugger Robot
9ef8268471 Merge "Camera: add webcam offline processing support" 2020-01-31 01:29:38 +00:00
TreeHugger Robot
cd3f355937 Merge "Camera: add webcam HAL@3.6 support" 2020-01-30 23:10:52 +00:00
Yin-Chia Yeh
7f2ce25f64 Camera: add webcam offline processing support
Test: CTS/VTS in follow up change
Bug: 135142453
Change-Id: I3e4dc201ac495e0966e47d45494a0db6c1c3b24a
2020-01-30 10:49:22 -08: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
Jayant Chowdhary
6248100ed6 camera: Add ICameraProvider@2.6.
ICameraProvider@2.6 adds the following new apis:

- getConcurrentStreamingCameraIds()
    tells the camera framework which combinations of camera ids may
    stream concurrently with guaranteed stream combinations

- isConcurrentSessionConfigurationSupported()
    in order to assist the camera framework in knowing which camera ids may stream
    concurrently and whether certain concurrent session configurations will
    be supported by the camera HAL.

Bug: 77960042

Test: builds

Change-Id: I47caddb7ae5c7b1b2e926f7b877f53a367564d2a
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-01-24 08:50:50 -08:00
Eino-Ville Talvala
b0ab1b8f74 Merge "Camera: Add android.scaler.rotateAndCrop control" 2020-01-24 06:04:15 +00: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
Eino-Ville Talvala
de45c29522 Camera: Add android.scaler.rotateAndCrop control
Test: New CTS tests pass
Bug: 134631897
Change-Id: Ibdfee75b9e77f661e1db5c26faeecae7853342bd
2020-01-21 00:29:31 -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
Yin-Chia Yeh
91e07785b5 Camera: add OFFLINE_PROCESSING APIs
Also a typo fix in metadata doc.

Test: N/A. New API skeleton, no implementation yet.
Bug: 135142453
Change-Id: I4852ee28242afabe81b02cfef39994c5d2705359
2019-12-16 11:40:28 -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
TreeHugger Robot
83f69f0da0 Merge "gralloc: update lock and lockYCbCr" 2019-11-25 17:44:53 +00:00
Marissa Wall
9c5ebfc5ba gralloc: update lock and lockYCbCr
IMapper 4.0 does support lockYCbCr functionality through lock and
BufferMetadata getters. However, we will wait to add the support in
one central gralloc library. For now just stub out the call so
there aren't any compiler errors.

Bug: 141631415
Test: Compiles

Change-Id: I9d2f70c87412f8ac2114db85eb6dc01539876e2b
2019-11-21 17:43:41 -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
Steven Moreland
4bc9e303b1 camer 2.5 lazy service: fix interface decls am: 2b4209ff93 am: 0784a43934
am: 5daeb12507

Change-Id: I2823d04ece7687bd54392cfc480167a25bc56dbb
2019-11-04 19:17:04 -08:00
Steven Moreland
2b4209ff93 camer 2.5 lazy service: fix interface decls
This fails to compile on builds where host init verifier is being used
because the entire interface inheritance hierarchy must be present.
This appears to be a simple case of a missed fixup in a bulk operation,
since the other .rc files in this directory already have this change.

Bug: N/A
Test: build fixed
Change-Id: If7f40f2532c90f4105f36c6bbcd64a318e557ab0
2019-11-04 12:36:53 -08:00
George Burgess IV
88ff2c6da3 Merge "camera: fix two potential null pointer uses" am: bf432cced9 am: ba1a53006f
am: 32a78e184a

Change-Id: I94a88acd4ce70d5ff733fd33c27c49cd0bc9f76b
2019-11-01 16:59:21 -07:00
George Burgess IV
2ea148804a camera: fix two potential null pointer uses
Caught by the static analyzer:
hardware/interfaces/camera/device/1.0/default/CameraDevice.cpp:401:9:
warning: Called C++ object pointer is null
[clang-analyzer-core.CallAndMessage]

Bug: None
Test: TreeHugger
Change-Id: Ia6d0a2ab4b4d04cfc171629c7dbf60ead181625d
2019-11-01 13:31:25 -07: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
Nick Desaulniers
99a2661f62 Merge "[hardware][interfaces][camera] fix -Wreorder-init-list" am: 977e274043 am: e6faf9820f am: a9d0279960
am: b7a210b0b7

Change-Id: I2478f5f4ff27937fa28fe92fb97a6fc1f46c2ba7
2019-10-14 17:43:08 -07:00
Nick Desaulniers
e1e932ea20 [hardware][interfaces][camera] fix -Wreorder-init-list
C++20 will require members in a designated initializer to be in order
unlike C99.

Bug: 139945549
Test: mm
Change-Id: I387d30e993719014da50207c7114b0003b9450c5
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
2019-10-14 11:05:30 -07:00
Steven Moreland
38c46d0b98 Merge "Remove libhwbinder/libhidltransport deps" am: 6b62c58a9a am: 8c22c3862f am: 6684ee8c36
am: 9a5ffa3196

Change-Id: I3a80895d10767fe68e90a907312a83ded976cbcc
2019-09-06 16:06:13 -07:00
Steven Moreland
b3a4d3832e Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
2019-09-06 01:07:02 +00:00
TreeHugger Robot
895cf804d6 Merge "Camera: Timing requirement between notify and processCaptureResult" 2019-08-22 05:08:10 +00:00
TreeHugger Robot
160cf8e74e Merge "gralloc: add IAllocator/IMapper 4.0 to camera HIDL" 2019-08-21 20:55:48 +00:00
Jayant Chowdhary
aff5cdc8b5 Merge "camera/metadata/3.5 Add SYSTEM_CAMERA capability." 2019-08-21 19:53:16 +00:00
Marissa Wall
a51eb93c51 gralloc: add IAllocator/IMapper 4.0 to camera HIDL
Add support for gralloc 4.0 to camera interface.

Bug: 136016160
Test: VtsHalCameraProviderV2_4TargetTest on a pixel
      with a local rev'd version of gralloc 4.0.

Change-Id: I7f2e14c291fbdafcb68c1e9c6e94fed87d810191
2019-08-20 15:36:41 -07:00
Peter Kalauskas
caed24ba9b Convert LazyServiceRegistrar usage to singleton
Test: lshal
Bug: 139376253
Change-Id: I32cb803fb73aa15b52676847b6e7eb09b86657dc
2019-08-19 21:15:30 +00:00
Shuzhen Wang
a9bd7a4e4f Camera: Timing requirement between notify and processCaptureResult
For physical sub-camera result error, require the notify() call is made
before the final processCaptureResult.

Test: Updated VTS test passes
Bug: 138727686
Change-Id: Ifba247bc1aa35ecdba651ea888dd26902a31647e
2019-08-14 11:03:41 -07:00
Jayant Chowdhary
bd5b290fbf camera/metadata/3.5 Add SYSTEM_CAMERA capability.
Bug: 133508924
Bug: 138135081

Test: builds

Change-Id: I67199769488b819f726d73a762f56980f9c94ca6
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2019-08-07 11:05:04 -07:00
zhangweiwei
c8ce2b26b1 Camera: Vts: Fix missing session close am: d21dd860ce
am: 7e49059a05

Change-Id: Iac501001a108f60f7734d5e0a0076d0aa95b49aa
2019-07-08 17:33:17 -07:00
zhangweiwei
235e9b03e2 Camera: Vts: Fix missing session close
am: d21dd860ce

Change-Id: I402a964794392ee6c4233241ce97a369b3b93781
2019-07-08 17:14:33 -07:00
zhangweiwei
d21dd860ce Camera: Vts: Fix missing session close
Test: vendor testing, Camera VTS on Pixel
Bug:135898951
Change-Id: I61f5a90d62732a00d0bc9abad05db0a1a9cc2b63
2019-07-08 08:45:18 -07:00
Emilian Peev
2d0100e36f Merge "Camera: VTS: Don't access invalid resources" into qt-dev am: d016fd7949
am: 137f202385

Change-Id: I54725456629d1cfcbb79027a151d336cd43b2479
2019-07-01 15:40:33 -07:00
Emilian Peev
2ff76229f9 Merge "Camera: VTS: Don't access invalid resources" into qt-dev
am: d016fd7949

Change-Id: Iace1d45a65c5fc16230b18fcc7e2de46aa561776
2019-07-01 15:26:32 -07:00
Emilian Peev
fd4ce7e76a Camera: VTS: Don't access invalid resources
There is no guarantee that the static metadata
pointer passed in the "DeviceCb" contructor will
be valid after the call completes.  The device
callback instance is expected to be active until
the camera session is open. Clone the required
metadata in "DeviceCb" and manage the lifetime
appropriately by using the "CameraMetadata"
wrapper.

Bug: 135976837
Test: CameraHidlTest#processCaptureRequestPreview
Change-Id: Idd3c6c8c2e5a3fc44a49712e25a04009cbd471b1
2019-06-28 17:03:12 +00:00
Shuzhen Wang
43975af52c Merge "Camera: VTS: Allow unsupported logical/physical combination" into qt-dev am: d4686a1a06
am: 0414e504d0

Change-Id: I6b4202980b9bcebcf4065e237aa9d9856dc3af5a
2019-06-26 09:06:15 -07:00
Shuzhen Wang
c39db71d53 Merge "Camera: VTS: Allow unsupported logical/physical combination" into qt-dev
am: d4686a1a06

Change-Id: I8f751938b986797c412c1a097d9a4909c8abcffe
2019-06-26 08:58:15 -07:00
TreeHugger Robot
d4686a1a06 Merge "Camera: VTS: Allow unsupported logical/physical combination" into qt-dev 2019-06-26 15:42:57 +00:00
Shuzhen Wang
fa2a909836 Camera: VTS: Allow unsupported logical/physical combination
Multi-camera API requirement is relaxed to allow camera device not
support physical stream combinations. Adjust the test accordingly.

Test: processMultiCaptureRequestPreview
Bug: 135688720
Bug: 135728906
Change-Id: I8c5269c5d3fd7f6eef440c818706629af2233196
2019-06-24 11:30:00 -07:00
Yin-Chia Yeh
80962f507e Merge "Camera: fix unknown bufId issue" into qt-dev
am: 981693f6ff

Change-Id: Idda1d94fd32ec3feb2e3929362ff3880c692fc6a
2019-06-19 19:02:59 -07:00
TreeHugger Robot
981693f6ff Merge "Camera: fix unknown bufId issue" into qt-dev 2019-06-19 23:03:53 +00:00
Yin-Chia Yeh
aba88c6cbc Camera: fix unknown bufId issue
It's legit to have bufId 0 in processCaptureResult with HAL buffer
manager, but not for returnStreamBuffers.

Test: the failed test can now pass
Bug: 135565913
Change-Id: I05947bc159bb9ba00a670b98d4622f685b4ac760
2019-06-19 11:51:48 -07:00
Shuzhen Wang
9d2ea958a6 Camera: Use original dataspace/format for 3.5 device
am: 22f6dcec7e

Change-Id: Iedb4e97abf10be30a257202f6d967b0e807dd0f8
2019-06-06 17:12:37 -07:00
Shuzhen Wang
22f6dcec7e Camera: Use original dataspace/format for 3.5 device
Starting from CameraDeviceSession 3.5, for IMPLEMENTATION_DEFINED pixel
format, configureStreams call uses original format and dataspace instead
of the overridden value.

This makes sure the HAL interface behavior is consistent between first
and subsequent processCaptureRequest() calls.

Test: Camera CTS and partner testing
Bug: 131864007
Change-Id: Id701141d2c11089ef063fd3f32444212855f84ab
2019-06-06 07:50:50 -07:00
Shuzhen Wang
d31d87a4d0 Merge "Camera: Add support for IMapper 3.0" into qt-dev
am: 057de3759f

Change-Id: I27626fd07bd275d28a14eeee332e9498a85e9673
2019-05-20 21:56:22 -07:00
TreeHugger Robot
057de3759f Merge "Camera: Add support for IMapper 3.0" into qt-dev 2019-05-21 04:35:47 +00:00
Shuzhen Wang
a96fe52bfc Merge "Camera: Fix remaining OWNER file include" into qt-dev
am: 9aec56107a

Change-Id: I0c47687bcb1589dbbe5e9961e1856bdce06ac556
2019-05-20 21:23:29 -07:00
Shuzhen Wang
0c6f8b6859 Camera: Fix remaining OWNER file include
Bug: 133188173
Test: None
Change-Id: I2da75bf9a7480974b3ca1c6eea52a58b46b0cc97
2019-05-20 17:30:40 -07:00
Shuzhen Wang
9d4b457285 Merge "Camera: Allow out-of-order ZSL shutter notify" into qt-dev
am: e4be4c9765

Change-Id: I112efe45e7dcc7d3bb3dd880d1596cb09534a24e
2019-05-17 14:56:12 -07:00
TreeHugger Robot
e4be4c9765 Merge "Camera: Allow out-of-order ZSL shutter notify" into qt-dev 2019-05-17 21:20:43 +00:00
Emilian Peev
c22d6eed67 Merge "Camera: Add fall back properties for FMQ size override" into qt-dev
am: a07b613b59

Change-Id: I1865a18a7bf1078d38bdc01db5916da8a68024d0
2019-05-16 14:48:42 -07:00
Shuzhen Wang
915115e381 Camera: Add support for IMapper 3.0
Use IMapper 3.0 if available. Otherwise, fall back to IMapper 2.0.

Test: Update camera VTS test passes
Bug: 128013727
Change-Id: I9bb54bbc290f1b90ef593dee9796b22b0dd49671
2019-05-14 10:39:25 -07:00
Emilian Peev
5ec377b430 Camera: Add fall back properties for FMQ size override
All system properties in the vendor partition must
start with either "vendor" or "ro.vendor".
Older devices should not be affected but newer
implementations may not be able to override the
FMQ size if needed.
Keep this functionality and provide fall back
properties using "ro.vendor.camera".

Bug: 77865891
Test: Manual using application and modified device configuration.
Change-Id: I23d0ba7a10eaafe98a708277c26579e8a0fec614
2019-05-09 17:13:08 -07:00
Shuzhen Wang
098720bc2c Camera: Allow out-of-order ZSL shutter notify
- Allow shutter notifies of zero-shutter-lag requests with STILL_CAPTURE
intent to be out of order compared to other kinds of requests.
- Shutter notifies of same kind of requests must be in order.

Test: BurstJpegCapture CTS test
Bug: 120604717
Change-Id: Ia31f0d17322cb9b850614413feb1134e16d69552
2019-04-29 14:18:55 -07:00
Yin-Chia Yeh
299d87a167 Merge "External Camera: support less thumbnail sizes" into qt-dev
am: 70e106d961

Change-Id: Id8b8a8e6dde98e1098a4c4d8d187543da1044dc5
2019-04-29 10:43:09 -07:00
Yin-Chia Yeh
0d540b3e75 External Camera: support less thumbnail sizes
Since larger thumbnail sizes might hit the app1 size limit
of 64KB.

Test: camera CTS
Bug: 119775355
Change-Id: I9d8d21ac0784c53b42c536cfa09a8c40c4f15ea0
2019-04-25 14:55:22 -07:00
Steven Moreland
99712c08cc Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I53e5bf67a0d314e1b10c0ba0c7172a7af358ddcc
2019-04-18 18:13:05 -07:00
Steven Moreland
6d494b2346 Merge "Update hidl makefiles for bpfmt" am: ff0bd741ca
am: 96f40f7b02

Change-Id: Idbf030e4993067bdb8181321bca2de00c9b6f7ef
2019-04-18 14:34:45 -07:00
Steven Moreland
1ae4615d9f Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I1f69d292bc23a7cc293a66110cb02d597e1019ad
2019-04-17 09:38:50 -07:00
TreeHugger Robot
7ffb10cd86 Merge "Camera: require torch API support for Android Q" into qt-dev 2019-04-11 22:04:52 +00:00
Yin-Chia Yeh
51ea7c984b Camera: require torch API support for Android Q
Torch API was mandated on legacy libhardware camera module 2.4.
We kept the option of not supporting this API because the first
HIDL legacy wrapper needs to also support libhardware camera
module 1.0 + HAL1.0. Now that HAL 1.0 is no longer supported,
we can reenforce the torch API being supported by camera HAL as
this is critical to power usage of flashlight usecase.

Test: adb shell VtsHalCameraProviderV2_4TargetTest
--hal_service_instance=android.hardware.camera.provider@2.4::ICameraProvider/legacy/0
Bug: 113336515

Change-Id: I0dcf2e7a5cddadcd097caf6913625d8a607065f8
2019-04-11 10:35:17 -07:00
Jayant Chowdhary
80bed174b2 Merge "Allow android.hardware.camera.common@1.0-helper to access vendor tags" into qt-dev 2019-04-05 16:39:16 +00:00
Jayant Chowdhary
661f4410f4 Allow android.hardware.camera.common@1.0-helper to access vendor tags
This allows vendor camera clients to access provider specific vendor
tags. No expected behavior changes to camera HAL process(es).

Also fixes OWNERS file.

Bug: 129688550

Test: AImageReaderTest modified to set a vendor tag in CaptureRequest
Test: Take still pictures / record video (sanity)
Test: camera CTS tests

Change-Id: I18b678e7e0db7f1b29c3de0b762cb65e25842fa8
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2019-04-04 14:24:06 -07:00
Emilian Peev
5874bba486 Camera: Avoid using an uninitialized physical camera id
'mStreamMap' entries can be inserted by several versions
of HIDL API calls. If the fields are initialized by an
older version, then make sure that newer additions are
always initialized in the respective API method.

Bug: 73885805
Test:
adb shell
/data/nativetest64/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest
--hal_service_instance=android.hardware.camera.provider@2.4::ICameraProvider/legacy/0

Change-Id: Ib5bd8f608da05f628c52d288c518cebbe964182b
2019-04-04 13:27:09 -07:00
Emilian Peev
70eae1d3f0 Camera: Set buffer request stream id
Additionally fix a possible issue with the buffer request index
and variable shadowing.

Bug: 129090247
Test: adb shell
/data/nativetest64/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest
--hal_service_instance=android.hardware.camera.provider@2.4::ICameraProvider/legacy/0

Change-Id: I34ab0285e59233c1b6d276f9167372ef3b0bbd0b
2019-04-04 13:22:25 -07:00
TreeHugger Robot
e7aeb819f8 Merge "Camera: Update VTS test for revised multi-camera requirement" 2019-04-03 00:06:55 +00:00
Emilian Peev
22ba924404 Camera: Update 'ERROR_RESULT' documentation
Extend "ERROR_RESULT" documentation and describe how Hal
must notify about physical device result failures and
logical device result failures.

Bug: 128835627
Test: Successful build
Change-Id: Iac5642f333634d9cc820eb727f8ff3534a47a583
2019-03-28 10:04:31 -07:00
Treehugger Robot
44968dc629 Merge "Y16 format enablement for external provider" 2019-03-25 20:19:44 +00:00
Shuzhen Wang
7788df304e Camera: Update VTS test for revised multi-camera requirement
Test to make sure logical multi-camera device support
isStreamCombinationSupported() for 3.5 and above devices.

Test: VtsHalCameraProviderV2_4TargetTest
Bug: 119325664
Change-Id: I734278799f10ed215ceb5dd108ac7f722f7f7925
2019-03-21 17:32:21 -07:00
TreeHugger Robot
469b3ac3d4 Merge "Camera: Add recommended low latency use case id" 2019-03-18 22:02:53 +00:00
TreeHugger Robot
9cc43c58a4 Merge "Camera: cleanup external camera HAL fence FD logic" 2019-03-15 18:17:50 +00:00
TreeHugger Robot
cccae8396b Merge "Y16 format enablement for external provider" 2019-03-15 01:23:16 +00:00
Emil Jahshan
a759713ca1 Y16 format enablement for external provider
added Y16 (depth) support for the external provider.
refactored initOutputCharsKeys to support both depth and color metadata according to the connected camera.
the VTS changes will be pushed to pie-vts-dev

Test: tested on intel depth camera D415 manually in addition to the VTS tests.

Change-Id: I358686e7c4330bb180dec4a9cce3bc1cf5475260
Merged-In: I358686e7c4330bb180dec4a9cce3bc1cf5475260
Signed-off-by: Emil Jahshan <emil.jahshan@intel.com>
2019-03-14 14:27:07 -07:00
Yin-Chia Yeh
965d9dd821 Camera: cleanup external camera HAL fence FD logic
Treat all non-negative integers as valid FD.

Test: webcam smoke test
Bug: N/A
Change-Id: I5fd52c0d195d2d4b63d70d66f10bd2a3ea99985c
2019-03-14 14:21:01 -07:00
Emil Jahshan
eed0040e21 Y16 format enablement for external provider
added Y16 (depth) support for the external provider.
refactored initOutputCharsKeys to support both depth and color metadata according to the connected camera.
the VTS changes will be pushed to pie-vts-dev

Test: tested on intel depth camera D415 manually in addition to the VTS tests.

Change-Id: I358686e7c4330bb180dec4a9cce3bc1cf5475260
Signed-off-by: Emil Jahshan <emil.jahshan@intel.com>
2019-03-14 14:06:17 -07:00
Steven Moreland
785f27e892 Merge "Remove import comment on camera metadata HAL." 2019-03-14 20:42:37 +00:00
Eino-Ville Talvala
ee2fb713b7 Merge "Camera: Centralize OWNERS" 2019-03-14 17:13:47 +00:00
Eino-Ville Talvala
d1ce4e664a Camera: Centralize OWNERS
Test: Builds
Change-Id: I9b8d1675566db44b959c633c25ceaf61a6dc08db
2019-03-13 15:15:45 -07:00
Steven Moreland
41be3682a3 Remove import comment on camera metadata HAL.
No good place in generated docs.

Bug: 124382459
Test: ./update-makefiles.sh
Change-Id: I7802d12c34b33be192c83fc46ffed5a6a7385a0a
Merged-In: I7802d12c34b33be192c83fc46ffed5a6a7385a0a
2019-03-13 02:34:29 +00:00
Steven Moreland
f8230e060c Remove import comment on camera metadata HAL.
No good place in generated docs.

Bug: 124382459
Test: ./update-makefiles.sh
Change-Id: I7802d12c34b33be192c83fc46ffed5a6a7385a0a
2019-03-12 19:34:15 -07:00
Emilian Peev
7549141c38 Camera: Add recommended low latency use case id
One extra recommended id must be present for low latency
snapshot use cases.

Bug: 128450197
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I259fec5157f1190c485a373dcaa500d02c0389be
2019-03-12 18:10:31 -07:00
Yin-Chia Yeh
c2707ebcc7 resolve merge conflicts of 00236ffa71 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I07e452ffd8dbe4492489d47459eb3662c76b78dd
2019-03-12 15:32:31 -07:00
Emil Jahshan
00236ffa71 Merge "VTS tests to work with depth Y16" into pie-vts-dev am: 0e802961e2
am: cbeda28395

Change-Id: Iac2b34c3ede77f1919ddce045a92f70991ae26e9
2019-03-12 14:43:32 -07:00
Emil Jahshan
cbeda28395 Merge "VTS tests to work with depth Y16" into pie-vts-dev
am: 0e802961e2

Change-Id: I0a42e16b82c60c0c36e1809b9839b73226b22660
2019-03-12 14:39:33 -07:00
TreeHugger Robot
2dfd5ccb18 Merge "Camera: Make availablePhysicalRequestKeys ndk public" 2019-03-08 00:24:10 +00:00
TreeHugger Robot
a3f6d38187 Merge "Camera: fill in num_output_buffers" 2019-03-06 19:52:18 +00:00
Shuzhen Wang
f09054c174 Camera: Make availablePhysicalRequestKeys ndk public
Test: camera ndk CTS
Bug: 115532726
Change-Id: I6a0e6c8bc14e68bddcd0a5617a706b16520ff871
2019-03-06 02:22:01 +00:00
Yin-Chia Yeh
0388c2bc1c Camera: fill in num_output_buffers
And also assert fence import should never fail.

Test: none
Bug: 125472550
Change-Id: Ib9bcc0234108ed0c752d5245d75fca6972e0c8ed
2019-03-05 15:29:39 -08:00
Steven Moreland
87f43604b9 Merge "Update makefies: no 'types' internal" 2019-03-05 17:40:03 +00:00
Steven Moreland
7f4e21adda Merge "Update makefies: no 'types'" am: 4ee5ec1469 am: bab622f6a6
am: 7224bc9bcf

Change-Id: I434939e0770afa436c532a945542fce30a71ef7d
2019-03-04 16:05:59 -08:00
Steven Moreland
b91ac5c6a0 Update makefies: no 'types' internal
Bug: 123976090
Test: N/A
Change-Id: I84b659b163b63d39535b462a3df8a9c19f680976
2019-03-04 14:09:25 -08:00
Steven Moreland
a878aee9ab Update makefies: no 'types'
Bug: 123976090
Test: N/A
Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
2019-03-04 11:27:17 -08:00
Emil Jahshan
b8524954e6 VTS tests to work with depth Y16
modified VTS tests functions to work with the Y16 format with the correct dataspace.
Y16 changes are in this patch: 847192

Test: ran and tested on intel depth camera D415 and a regular RGB camera

Change-Id: Ie40347d58d4f72ed2fc9676bdaab2d1dca5dc5bc
Signed-off-by: Emil Jahshan <emil.jahshan@intel.com>
2019-02-24 09:40:24 +00:00
Shuzhen Wang
2f06e17122 Camera: Document bufferSize for JPEG_APP_SEGMENTS stream
Doc update to clarify that @3.4::Stream::bufferSize is updated by camera
framework.

Test: Build
Bug: 124999074
Change-Id: I818f75eabd613cc5f6d9b7e73b2b1a894b511afe
2019-02-20 16:23:31 -08:00
Yin-Chia Yeh
9e3079b0de Camera: remove stream_configuration_counter from camera3.h
Handle the race issue in the wrapper HAL instead of letting HAL
implementation handing it.

Test: Pixel 3 + camera CTS + GCA
Bug: 120986771
Change-Id: Iff97fcaa969bea6668679c57642e4322c4ca5c19
2019-02-14 14:18:01 -08:00
Yin-Chia Yeh
71e6298ea6 Camera: fix per stream error code for HAL buffer manager
Also some refactoring to make the code more readable and less
indent.
Also clarify the unknown error case that per stream error code
might still be provided.

Test: GCA smoke test and camera CTS
Bug: 120986771
Change-Id: I3b7d3eadfe3895a3fdf3888735a3932d5c6c03bc
2019-02-14 14:17:33 -08:00
Emilian Peev
332467b8bf Merge "Camera: Enable session parameter reconfiguration queries" 2019-02-13 21:54:22 +00:00
Emilian Peev
22eac5f667 Camera: Enable session parameter reconfiguration queries
Check with Hal whether stream reconfiguration is required
in case of session parameter updates.

Bug: 122609098
Test: Manual using application,
vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: Ic02525871aa079393b28b2da53764093f95f881d
2019-02-12 14:54:00 -08:00
Steven Moreland
907c8ccc2b Merge "Update makefiles." 2019-02-12 22:20:43 +00:00
Jayant Chowdhary
48f3952ffc Documentation updates to camera HAL interfaces.
Bug: 124248114

Test: mm -j64

Change-Id: If1cf0e2d464ac62e5897b8faaf4835d06c12edd8
Merged-In: Ibc2415531a16e42ae81e33c3bdb28aca08e6a5fe
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2019-02-12 11:16:17 -08:00
Shuzhen Wang
892e826a32 Camera: Handle binder call failure due to static metadata size
For physical camera static metadata, we should reduce its size before
passing it across binder if possible.

Test: Camera CTS
Bug: 124129552
Change-Id: I0d9129642ddcbb4c1a1c7fcf7a88bac734be4f5a
2019-02-12 08:54:45 -08:00
Steven Moreland
f8a47b7f01 Update makefiles.
Bug: 123976090
Test: N/A
Change-Id: I5fb6c126a090a3fe0fa4829ea9224564133dc1ae
2019-02-11 21:14:16 -08:00
Eino-Ville Talvala
fbb176e069 Merge changes from topic "camera-provider-2.5"
* changes:
  Camera: Add default 2.5 provider for legacy and external webcam HALs
  Camera: Restructure default camera.provider 2.4
  camera.provider: Add @2.5 to support notifyDeviceStatusChange
2019-02-11 01:22:52 +00:00
Eino-Ville Talvala
aa04b3ba10 Camera: Add default 2.5 provider for legacy and external webcam HALs
Add 2.5 implementations, which do not support passthrough mode and
therefore doesn't need the HIDL_Fetch methods or a specially-named
-impl library in the /hw directory.  Instead, the service directly
instantiates the necessary service.

Also add VTS tests for the new notification

Test: Verify device state changes are logged by HAL
Test: Camera starts as usual with both 2.4 and 2.5 providers on
      walleye.  Camera CTS completes.
Test: New VTS tests pass
Bug: 121379978
Change-Id: I0fc99379eb7e01c5b2efb20afb5753bb6ce8b627
2019-02-07 16:30:14 -08:00
Eino-Ville Talvala
2951804146 Camera: Restructure default camera.provider 2.4
To allow for implementation inheritance of @2.4 legacy wrapper and
@2.4 external webcamera HALs in the @2.5 implementations, restructure
the existing default provider to separate the service interface into a
thin shim that calls the implementations.

Test: Camera starts as usual after refactor, VTS tests pass
Bug: 121379978
Change-Id: Id40790ed4fb495577fd2b885c706b2ed7a96d64e
2019-02-07 16:20:35 -08:00
Eino-Ville Talvala
918a7de8d5 camera.provider: Add @2.5 to support notifyDeviceStatusChange
Sometimes, the camera service needs to notify a camera HAL that the
overall device physical state has changed, so that the HAL can
properly remap how it handles logical multicamera devices or similar.

Test: Builds, new VTS tests pass
Bug: 121379978
Change-Id: I0982fdecaf53a0529289d63c08c5a31264ee7ec7
2019-02-07 16:20:11 -08:00
Shuzhen Wang
e7b88b706b Merge "Camera: Add HAL interface change for HEIC" 2019-02-07 19:15:34 +00:00
Jayant Chowdhary
f1d79e8af3 Merge "Add SECURE camera capability." 2019-02-05 17:55:03 +00:00
Shuzhen Wang
55386823a3 Camera: Add HAL interface change for HEIC
- Add new usage flag to indicate the consumer of the buffer is HEIC
encoder.
- Add new data space to indicate that the BLOB buffer is HEIC encoded.
- Add new BlobId to specify JPEG APPs segments.

Test: testHeic CTS test
Bug: 79465976
Change-Id: Iaa6a1d017223e84fc1c5dd0a9d90d9f09240e827
2019-02-04 16:44:16 -08:00
Sasha Smundak
791b843bcb Merge "Explicitly include log/log.h or android/log.h instead of cutils/log.h" am: b5db125860 am: 4a1f714ed0
am: 1e45903dd5

Change-Id: I1a54776b7560154304573a8cd3dfeae5babf43e5
2019-02-01 13:22:37 -08:00
Sasha Smundak
769c053d7c Explicitly include log/log.h or android/log.h instead of cutils/log.h
Eliminates the warning.
Test: treehugger

Bug: 123758136
Change-Id: Ibe50261efc18d659a10129977342bc765a9ba9d5
2019-02-01 10:52:09 -08:00
TreeHugger Robot
0a742a0409 Merge "Camera: support libhardware camera device 3.6" 2019-01-30 19:24:31 +00:00
Jayant Chowdhary
1135219245 Add SECURE camera capability.
Bug: 123046494

Test: Builds

Change-Id: I8d90edc2606e535bbf8ebe4e0ebaffeba6ad17dd
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2019-01-30 10:05:18 -08:00
Yin-Chia Yeh
c2d3d1ddb5 Camera: support libhardware camera device 3.6
Add buffer management API support.

Test: VTS to be written. Need Pixel device impl to verify.
Bug: 120986771
Change-Id: Icdbc621f8cd17aa0868d3ac361867c44793a268c
2019-01-28 11:22:15 -08:00
Emilian Peev
5f103998ff Camera: Add dynamic depth tags and dataspace
Add necessary metadata tags for supporting dynamic depth
streams.
Includes minor gfx fix which should help eliminate build
errors after HIDL header autogen.

Bug: 109735087
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
    --skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: Ia476b195095ae7a29bc740174331dfbfdaa6d320
2019-01-27 20:06:11 -08:00
TreeHugger Robot
8c2c8d9657 Merge "Camera: Enable external camera handling in default provider." 2019-01-26 13:39:00 +00:00
Shik Chen
758f4bb127 Camera: Enable external camera handling in default provider.
* The sCameraDeviceStatusChange() callback might be fired between
  initialize() and setCallback(), which can be easily triggered if there
  is an external camera connected at the boot time.

* The external cameras need to be excluded in the getCameraIdList().

Bug: 77833131
Bug: 122800852
Test: Reboot with an external camera is connected, and see the
      camera list is corrected probed in
      $ android-sh -c 'dumpsys media.camera'
      The testing device is Nautilus (Samsung Chromebook Plus).

Change-Id: I5cec6732ce4e26632f1bb5186331b7ce7a94a0b3
2019-01-26 05:18:46 +08:00
Pierre Lee
e233a7c98d The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200
am: 6f6fe9a5e2

Change-Id: I037a4eb21f0eee79acf78f15a1cd5bb9fef5da7b
2019-01-23 21:44:20 -08:00
Shuzhen Wang
4ee03d1ba7 Merge "Camera: Add ACTIVE_PHYSICAL_ID metadata for logical camera" 2019-01-24 01:55:27 +00:00
Socrates Li
9ada649246 Camera: Document 3.4 metadata selection logic.
Bug: 119575429
Test: Ensure everything still builds.
Change-Id: I6500ab06b8c392310009ecfa0570000742fd069c
Merged-In: I6500ab06b8c392310009ecfa0570000742fd069c
(cherry picked from commit a5cbabbee9)
2019-01-22 13:46:57 -08:00
Pierre Lee
62da080e00 Merge "The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200" am: ac6175ee79 am: cb516f7cca
am: 556b049596

Change-Id: I40eb4709eaea843a06222c20baec61c150d5e3f5
2019-01-21 20:29:42 -08:00
Pierre Lee
6f6fe9a5e2 The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200
VTS gets the name of all the cameras in the machine and check each camera, When traversal to the configuration reference of 1600*1200 camera, the outputPreviewStreams variable does not clear, save the value of the Previous camera
The outputPreviewStreams variable needs to be cleared when check next camera

Bug: 122806546
Test: ConfigureStreamsWithSessionParameters can pass when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200
Change-Id: Ia4845d43871730e14b5ba1411ce72f8c4bb69042
Merged-In: Ia4845d43871730e14b5ba1411ce72f8c4bb69042
2019-01-22 04:13:52 +00:00
Treehugger Robot
ac6175ee79 Merge "The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200" 2019-01-22 04:12:43 +00:00
Shuzhen Wang
cc266b1699 Camera: Add ACTIVE_PHYSICAL_ID metadata for logical camera
And update VTS test for the new tag.

Test: Compile
Bug: 77915333
Change-Id: Ib0f1d54965047c5d20bf0c6f90ddb07225d8a328
2019-01-18 00:21:10 -08:00
Pierre Lee
f234e45b20 The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200
VTS gets the name of all the cameras in the machine and check each camera, When traversal to the configuration reference of 1600*1200 camera, the outputPreviewStreams variable does not clear, save the value of the Previous camera
The outputPreviewStreams variable needs to be cleared when check next camera

Bug: 122806546
Test: ConfigureStreamsWithSessionParameters can pass when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200
Change-Id: Ia4845d43871730e14b5ba1411ce72f8c4bb69042
2019-01-18 11:12:37 +08:00
TreeHugger Robot
207f2b51c6 Merge "Camera: Document 3.4 metadata selection logic." 2019-01-17 23:59:40 +00:00
TreeHugger Robot
3ed0179295 Merge "Camera: Extend stream combination query documentation" 2019-01-17 09:53:41 +00:00
Emilian Peev
06c07730de Camera: Extend stream combination query documentation
Stream combination queries differ from regular stream
configuration in several ways. Extend documentation
and mention any fields that Hal implementations must
ignore when checking the input arguments.

Bug: 111593096
Test: Android builds successfully
Change-Id: Iab97d2cf8aebc29c9ec4c34a382893299a9b9752
2019-01-16 11:21:00 +00:00
Jayant Chowdhary
6a20bda67a Merge "Add VendorTagDescriptorCache to android.hardware.camera.common@1.0-helper" 2019-01-15 23:12:48 +00:00
Shuzhen Wang
eaab6169b1 Camera: Clarify the FMQ read order for request/result
If there are more than one metadata entities being passed
via FMQ, specify the framework read order.

Test: Build
Bug: 119575429
Change-Id: Ia34ac69ce670b1ebeda12d92af490c347f33c15b
Merged-In: Ia34ac69ce670b1ebeda12d92af490c347f33c15b
2019-01-14 16:29:25 -08:00
Socrates Li
a5cbabbee9 Camera: Document 3.4 metadata selection logic.
Bug: 119575429
Test: Ensure everything still builds.
Change-Id: I6500ab06b8c392310009ecfa0570000742fd069c
2019-01-14 16:08:31 -08:00
TreeHugger Robot
0dde018278 Merge "Camera: Clarify the FMQ read order for request/result" 2019-01-14 23:04:12 +00:00
Jayant Chowdhary
8cd3ba8fdf Add VendorTagDescriptorCache to android.hardware.camera.common@1.0-helper
Since android.hardware.camera.common@1.0-helper is a utility VNDK
library, where the implementation isn't linked to a specific version of
any HIDL interface we don't uprev the library.

Bug: 122477622

Test: builds

Change-Id: Idb7cb9569cf4490659be0090d72f91f411c8dbc8
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2019-01-14 12:39:38 -08:00
Shuzhen Wang
17a371de6e Camera: Clarify the FMQ read order for request/result
If there are more than one metadata entities being passed
via FMQ, specify the framework read order.

Test: Build
Bug: 119575429
Change-Id: Ia34ac69ce670b1ebeda12d92af490c347f33c15b
2019-01-14 11:07:39 -08:00
Emilian Peev
338a5559f3 resolve merge conflicts of fe57c318d3 to
master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ibe64d18c0637f22032a5aedc74da5cd0a0141e2a
2019-01-14 12:33:59 +00:00
Yin-Chia Yeh
fe57c318d3 Merge "Camera: fill in bufferSize correctly" into pie-vts-dev am: d04f64ef24
am: 31ad8ce667

Change-Id: I4d560b783331836629aa57827c6391261a826504
2019-01-14 04:13:39 -08:00
Yin-Chia Yeh
dbb2211d32 Merge "Camera: fill in bufferSize correctly" into pie-vts-dev
am: d04f64ef24

Change-Id: I33583bbfda0b8f1a480df6a2fe7c88bdf504d493
2019-01-14 04:06:37 -08:00
Yin-Chia Yeh
31ad8ce667 Merge "Camera: fill in bufferSize correctly" into pie-vts-dev
am: d04f64ef24

Change-Id: I1d3a33e8bc58d0f99167f5bc3da6b6abf81d6d52
2019-01-14 04:05:42 -08:00
Yin-Chia Yeh
9d4ff706e1 Camera: fill in bufferSize correctly
Test: partner testing
Bug: 118724188
Change-Id: If21762467e6458f923d7f9b7eeef41d987c196a1
2019-01-14 10:54:11 +00:00
Yin-Chia Yeh
1c30a5e375 Camera: make external camera orientation configurable
Test: webcam preview has correct aspect ratio on phones
Bug: 115774657
Change-Id: I8dcb1a55c4d63c9080f44b85e87d97c138bc5243
2019-01-08 10:54:10 -08:00
TreeHugger Robot
e6a12511d7 Merge "Camera: Make logical camera physical Ids to be ndk public" 2018-12-21 18:23:35 +00:00
Treehugger Robot
4ffb6e0bd8 Merge "Camera: Clarify configureStreams doc" 2018-12-17 22:47:12 +00:00
Chih-hung Hsieh
df66e3cb29 Merge "Fix performance-for-range-copy warnings" am: d01f7050ac am: 51e835ce22
am: 86fefab5e9

Change-Id: Ib139d710d47a7a51e24ba8ba582b252f5ff6e244
2018-12-17 14:09:52 -08:00
Chih-Hung Hsieh
65ab67312b Fix performance-for-range-copy warnings
Bug: 30413223
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance*
Change-Id: I1b76a22eab100a31e77048626e48169fe7eeaf92
2018-12-17 19:57:21 +00:00
Shuzhen Wang
77c5c4e8b1 Camera: Clarify configureStreams doc
Test: Compile
Change-Id: Idbb7ed8f8dd0a1ebe1d5227446ec7170fec3ec4a
Merged-In: Idbb7ed8f8dd0a1ebe1d5227446ec7170fec3ec4a
2018-12-15 00:51:59 +00:00
Shuzhen Wang
f43ecc9c4b Camera: Make logical camera physical Ids to be ndk public
Test: Newly added NDK CTS and VNDK test pass
Bug: 115532726
Bug: 120566141
Change-Id: I55c0dff47cbaefa223c22094635055349ea59e92
2018-12-14 11:00:32 -08:00
Shuzhen Wang
49fcad2b8e Camera: Clarify configureStreams doc
Test: Compile
Change-Id: Idbb7ed8f8dd0a1ebe1d5227446ec7170fec3ec4a
2018-12-13 15:54:14 -08:00
Treehugger Robot
565fe88676 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" 2018-12-13 05:45:20 +00:00
Xin Li
5c60a30824 DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534
Change-Id: I9e51f516a0ff8cb197e9f3f927cae9e25328a1eb
2018-12-11 14:17:43 -08:00
Peter Kalauskas
0b35cb2591 Add new lazy service target to default camera HAL
Test: On walleye_svelte, reboot device and check that camera HAL is not
      running until camera app is opened
Bug: 79374634
Change-Id: Ib9968c899ce8be5a68a28b4decf0a52f96b20ec5
2018-12-07 15:43:11 -08:00
Keun Soo YIM
68ae05dd2d pack VTS cc_test binaries as general-tests
Test: make general-tests
Bug: 120093339
Merged-In: I363450d205868f900e4925ccff1430e2a569f2a4
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-12-07 10:49:56 -08:00
Emilian Peev
40a8c6ed51 Camera: Add support for stream combination query
Camera devices 3.5 and later can optionally support
stream combination queries. These use the regular
'StreamConfiguration' structure however in contrast
to normal stream configuration, the query will be
much faster and will not cause any HW/SW side effects.
Additionally it will be possible to run stream
combination queries at any time after the camera
device is open.
Implement stream combination query for the external
camera provider.

Bug: 111593096
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I59ec936d17dabc89ba49407a750df1cd2e61b145
2018-11-29 16:40:36 +00:00