Commit Graph

323 Commits

Author SHA1 Message Date
TreeHugger Robot
4c5bfc6979 Merge "Camera: add buffer size to Stream" 2018-01-30 06:05:25 +00:00
Yuriy Romanenko
e932f1b5cb Implement JPEG support in external camera HAL
* Certain tests are still failing

Change-Id: I01bb90757cd969ace30857a8d246e4701498d379
2018-01-29 12:07:34 -08:00
Yuriy Romanenko
33d5f66633 Common: Added CameraMetadata -> libexif converter
A fully-ported version of the ExifUtils class from
ChromeOS (see [chromeos]/src/platform/arc-camera/common/exif_utils.cc)

 * Made into an interface to remove libexif dependencies
   from header file
 * Rewrote ChromeOS dependencies
 * Minor fixes

Change-Id: I2e93fa3e08e6b82b26641cc736eeb1c61b04a2c0
2018-01-26 21:23:56 -08:00
Yin-Chia Yeh
b534d9bf29 Camera: add buffer size to Stream
So that HALs without device knowledge knows the maximal size
it can lock using graphics mapper API.

Bug: 64874137 72261675
Change-Id: I7363f5c63d955ab412f9570bf8e5be2a942cf381
2018-01-26 16:50:24 -08:00
Yuriy Romanenko
083de0c3c6 ExternalCameraDeviceSession: Fix request initialization
This code was exiting because of unsupported RequestTemplate::*
enum values that are now just ignored.

Change-Id: I37f79cbbfe99664ec173458721d71947f0d002ff
2018-01-26 16:11:12 -08:00
TreeHugger Robot
354db50595 Merge "External Camera: more CTS fix" 2018-01-25 23:37:41 +00:00
Yuriy Romanenko
d0bd4f11f8 Common: Added lock() to camera HandleImporter
Effectively a counterpart to lockYCbCr() but for generic single-plane
buffers

Change-Id: I73d051c085fe2b96810a1ed761deac177db2733d
2018-01-25 12:50:40 -08:00
Yin-Chia Yeh
4acd76e647 External Camera: fix aspect ratio/crop issue
Also switch to new EXTERNAL hardware level.

Test: ImageReaderTest#testAllOutputYUVResolutions pass
Bug: 72261912
Change-Id: I95f05a20827b413bfa480b0336fff395159678eb
2018-01-25 18:47:51 +00:00
Shuzhen Wang
39cf8fd9fe camera: Add physical camera metadata in CaptureResult
- When physical stream of a logical multi-camera is requested, HAL needs
to generate metadata for the physical cameras.
- In case no physical stream is requested for the logical multi-camera, no
capture result metadata is required for physical camera.
- Batch physical and logical metadata within one capture_result call.

Test: testLogicalCamera CTS test
Bug: 64691172
Change-Id: Id040620f3f0c350711d49341ab31ab88ecd94888
2018-01-24 18:14:58 -08:00
Yin-Chia Yeh
fb1c154342 External Camera: more CTS fix
Test: CameraDeviceTest, CaptureResultTest, StaticMetadataTest
      ExtendedCameraCharacteristicsTest, RobustnessTest
Bug: 72261912

Change-Id: Id99d86db99a905afcc41d3e9d297ce3533d852a2
2018-01-24 15:48:42 -08:00
Eino-Ville Talvala
658d30d3c8 camera.device@3.4: Add MOTION_TRACKING template enums
- Extend RequestTemplate with two new values
- Add legacy wrapper support for the new templates

Test: Builds, camera continues to run. CTS coverage of templates
tests new templates as expected.
Bug: 63629224
Change-Id: I2a44d86a815690798fa4b8327794c64716d134ee
2018-01-23 17:10:33 -08:00
Steven Moreland
5d1e41a8fd Update makefiles.
Bug: N/A
Test: N/A
Change-Id: Idb1d74aeed9b82ca6568c76f35552f3fcc894239
2018-01-23 19:44:19 +00:00
Yin-Chia Yeh
ab4502c707 Merge "Camera: Add external camera provider" 2018-01-23 02:54:27 +00:00
Guennadi Liakhovetski
6d2d1307e6 Merge "camera: add support for camera removal" am: cf99978291 am: 040c21f6c8
am: 3724fbedef

Change-Id: Ic32fd930f90515a74d1e44e4a3e932d20d7970ff
2018-01-23 02:52:28 +00:00
TreeHugger Robot
067a95dd28 Merge "camera.common@1.0: Add OWNERS to default/" 2018-01-23 02:37:39 +00:00
Yin-Chia Yeh
1903059507 Camera: Add external camera provider
Bug: 64874137 63873538

Change-Id: I4309874a7dedd3dd71d4bd0c2004d460421db679
2018-01-22 17:04:28 -08:00
Shuzhen Wang
30170d5590 Merge "camera: Add support for individual physical camera requests" 2018-01-23 00:36:17 +00:00
Eino-Ville Talvala
dc9c5ebb02 camera.common@1.0: Add OWNERS to default/
Test: Builds
Change-Id: I47d38789d8145cc34d74dcd8433f46f9688af88d
2018-01-22 15:25:53 -08:00
TreeHugger Robot
34c880d59a Merge "camera: Add OIS data keys" 2018-01-22 23:22:30 +00:00
Shuzhen Wang
4f3be2e3e9 Merge "camera: Add support for logical camera" 2018-01-22 20:30:15 +00:00
TreeHugger Robot
97d3c3b991 Merge "Camera: Include session parameters for 3.4 devices" 2018-01-22 20:26:32 +00:00
Guennadi Liakhovetski
eca1d45ba7 camera: add support for camera removal
Add camera removal support to CameraProvider and CameraModule.

Change-Id: I047e486d1665ba9e0b1455f77a7bbbb5e0d66653
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
2018-01-22 12:01:08 -08:00
Emilian Peev
b75aa350e7 camera: Add support for individual physical camera requests
Multi-camera devices should be able to accept and process
individual settings for all physical sensors backing the
logical camera. 'CaptureRequest' must be extended to hold
these additional physical camera settings.

Test: Manual using camera application,
camera_client_test,
run vts --skip-all-system-status-check --skip-preconditions
--primary-abi-only --module VtsHalCameraProviderV2_4Target -l INFO
Bug: 64691172
Change-Id: Ia38d1e7681a9385be7578c11e40f4e35e9101d75
2018-01-20 15:51:37 +00:00
Shuzhen Wang
82e36b3f8c camera: Add support for logical camera
- Add physical cameraId field in stream structure.
- Override processCaptureRequest due to physicalCameraId change.
- Update 3.3 metadata with logical camera characteristics.

Test: Camera CTS on Taimen, LogicalCamera CTS test on C1
Bug: 64691172
Change-Id: I65bd1ae38381ecb89fae439ae14b813c9bcc3248
2018-01-20 15:51:13 +00:00
Emilian Peev
37e1a5dcfd Camera: Include session parameters for 3.4 devices
To avoid glitches and unexpected behavior, session parameters
should be included in the stream configuration before invoking
capture requests.

Bug: 70560715
Test: run vts --skip-all-system-status-check --skip-preconditions
--primary-abi-only --module VtsHalCameraProviderV2_4Target -l INFO

Change-Id: Id4ecd40533157f1a3299099a984ffab21654548a
2018-01-20 15:47:31 +00:00
Chien-Yu Chen
5e8a1be6e6 camera: Add OIS data keys
Test: CTS
Bug: 64847201
Change-Id: I47f5d69f031ee0af8451fe87b746ca726400c55e
2018-01-19 16:22:59 -08:00
Yin-Chia Yeh
729eef72eb Camera: add new EXTERNAL hardware level
Bug: 64874137 63873538
Change-Id: I7063b3926c4ce649cba501467955a9885639f7be
2018-01-19 11:40:40 -08:00
TreeHugger Robot
32f4103dac Merge "camera: Add external flash mode key" 2018-01-19 04:19:24 +00:00
Guennadi Liakhovetski
e56eafc61d Merge "Camera: Fix hotplug" am: d7a0f2984d am: 78d88380d3
am: 99aaf673c5

Change-Id: I3e9566c4960c9f11376c7b0c8f377f9ccc1ac1ac
2018-01-18 20:20:55 +00:00
Treehugger Robot
d7a0f2984d Merge "Camera: Fix hotplug" 2018-01-18 20:11:39 +00:00
Steven Moreland
a6c5ff2c6d Update makefiles.
Some have missed being updated.

Bug: N/A
Test: N/A
Change-Id: I0925e85701f6e8b98f9b09bfafbed73469d1d185
2018-01-17 11:20:17 -08:00
Chien-Yu Chen
79f734b8f0 camera: Add external flash mode key
Test: CTS
Bug: 64847201
Change-Id: Ic99df793e4fe2b016c930c344eb64a264f004945
2018-01-11 10:58:29 -08:00
Emilian Peev
9fc7f3b467 camera: Correct 'availableSessionKeys' version
The metadata version for the available session keys should be 3.3 .

Bug: 64450664
Test: Builds, hidl-gen/hidl-doc are happy
Change-Id: Id53cfeda8c7d528d10c3dd26c64bdb56d9404cb2
2018-01-10 13:53:55 +00:00
Eino-Ville Talvala
e41911b65c Add MOTION_TRACKING capability/intent, and lens poseReference
Test: Builds, hidl-gen/hidl-doc are happy
Bug: 63629224
Change-Id: Ibf8a57c3d917f24db6ff269461d55f177ec55fcf
2018-01-05 12:02:48 -08:00
Guennadi Liakhovetski
7b7ede7ebd Camera: Fix hotplug
According to the camera_module_t::get_number_of_cameras() description
in camera_common.h, it should only return the number of "fixed"
cameras, i.e. cameras, facing to the front and to the back. Any
cameras, with the facing value of "external," i.e. externally connected
cameras, should not be reported by it, instead they should later be
reported, using the
camera_module_callbacks_t::camera_device_status_change() callback.
However, this doesn't work. When a camera is reported this way, it is
ignored as unknown. Fix this by adding a new camera, when its status
change is reported.

Change-Id: I18874ed005f477e32fb723c00c16b67a81cde6ce
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
2018-01-04 11:42:27 +01:00
Chien-Yu Chen
13cfbf07ff camera: Add device info version
Test: CTS
Bug: 64847201
Change-Id: I4e9002bb8ed47249eff00e54dfd3b31c97d28777
2018-01-03 14:39:59 -08:00
TreeHugger Robot
a557df85f0 Merge "Camera: Bump device version to 3.4" 2017-12-22 19:18:51 +00:00
TreeHugger Robot
1eab571c03 Merge "Add camera.metadata@3.3" 2017-12-22 00:16:57 +00:00
Emilian Peev
e18057b42f Camera: Bump device version to 3.4
Camera devices supporting version 3.4 will be able to receive
session parameters during the stream configuration phase.

Bug: 64450664
Test: Camera CTS
run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO

Change-Id: Ifd83bfe0e512fe75b63602b4aba98f4cc1cdeb53
2017-12-20 10:44:11 +00:00
guoyin.chen
bc164e1300 Merge "openmax header files have been relocated" am: 8e0f8836d9 am: 3794336021
am: fed56a4ed9

Change-Id: I55d350c1c00b989d0e41b98646b54d1f64bf92dc
2017-12-20 00:34:42 +00:00
guoyin.chen
fed56a4ed9 Merge "openmax header files have been relocated" am: 8e0f8836d9
am: 3794336021

Change-Id: I1a1fa65280343197f2dbc100b56153b028ea0adf
2017-12-20 00:32:05 +00:00
Eino-Ville Talvala
6d3feccd88 Add camera.metadata@3.3
To be used by camera.device@3.4; unfortunately the versioning is
now skewing since no metadata additions were needed for device@3.3

Includes the earlier-added control.afSceneChange entry.

Test: hidl-gen, hidl-doc, builds
Bug: 64847201
Change-Id: I341a018a7eccf63758e356e9b426a41b575ade9f
2017-12-19 12:01:10 -08:00
TreeHugger Robot
5ccd0eb248 Merge "Camera: add hardware level check" 2017-12-19 01:17:48 +00:00
guoyin.chen
1b1f65808a openmax header files have been relocated
openmax header files relocated at headers/media_plugin/media/openmax
Build error as below:
source path frameworks/native/include/media/openmax does not exist

Change-Id: Ifb43a8b47c9ecd7adc4ef715948c52015603ba40
Signed-off-by: guoyin.chen <guoyin.chen@nxp.com>
2017-12-19 01:57:58 +08:00
Yin-Chia Yeh
13774fd5f6 Camera: add hardware level check
To disallow HAL3 device advertise itself as LEGACY.

Test: ran on walleye
Change-Id: Ib0b98f32c401566323eee546ee23c7873c00aef0
2017-12-06 13:59:28 -08:00
Eino-Ville Talvala
cc08739452 camera.metadata@3.2: Auto-generate metadata enums
Replace hand-written types.hal with one autogenerated from the
metadata definitions, like the SDK, NDK, and camera_metadata C library
definitions are.

No changes to actual definitions; only formatting changes and basic
documentation of each entry are added.

Add the new hash of camera.metadata@3.2::types to current.txt.

Bug: 33262893
Test: Manual inspection of new vs. old types.hal, builds, hidl-doc output
   is acceptable
Change-Id: Idd8c228359e45de3609bc16ac19e878b0ed0a557
2017-12-05 12:27:52 -08:00
Steven Moreland
4e1e4081e4 Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
(cherry-picked from commit c2f829a1d2)
2017-12-03 10:31:49 -08:00
Steven Moreland
e5c6548346 Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:23:43 -08:00
Steven Moreland
8b76a6b90d Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:22:55 -08:00
Steven Moreland
fcca4e23b7 Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:22:43 -08:00