Commit graph

666 commits

Author SHA1 Message Date
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
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
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