Yin-Chia Yeh
8bc10783a9
Merge "Camera: fix camera_metadata address expectation" into oc-dev
...
am: e812feb56f
Change-Id: Id3e433048cf25e8c50aa20e97dca6e3112f0fb57
2017-06-16 19:37:00 +00:00
Yin-Chia Yeh
92d885b558
Camera: fix camera_metadata address expectation
...
On 32bits architecture, binder driver might allocate
non-8 bytes aligned buffers.
Test: compile (problem not reproducible on 64bit SOCs)
Bug: 62637461
Change-Id: I8ef2b3ecba783a8d189ebe18733082d32cff4899
2017-06-15 14:27:13 -07:00
Yin-Chia Yeh
2912d05274
Merge "Camera: fix release fence FD leaks" into oc-dev am: 6e7ca4e166
...
am: a9576758e2
Change-Id: I3fe086caa15f5ab3fd065cba312b6693f8da828d
2017-05-30 22:47:14 +00:00
Yin-Chia Yeh
a9576758e2
Merge "Camera: fix release fence FD leaks" into oc-dev
...
am: 6e7ca4e166
Change-Id: I82df851760e0d85890fcc85496afb302f38d3ed7
2017-05-30 22:39:03 +00:00
Yin-Chia Yeh
aa6993121e
Camera: fix release fence FD leaks
...
Test: use sw_sync to fake release fence FDs, GCA, CTS
Bug: 62070085
Change-Id: Iae77a2e112df5363e55e4177656a5dd41b830cbd
2017-05-26 16:28:45 -07:00
TreeHugger Robot
0c2a8f7d73
Merge "Camera: Remove binderized todo comment"
2017-05-26 15:23:25 +00:00
Shuzhen Wang
32f0b047dc
Camera: Silence log spam am: 207867716a
...
am: 6ccc129e91
Change-Id: Ida70914135764b034aff9c09b288df5a31cb9c60
2017-05-25 23:16:58 +00:00
Shuzhen Wang
6ccc129e91
Camera: Silence log spam
...
am: 207867716a
Change-Id: I697d551878713f56ed5845b3ebd87db76e1b513e
2017-05-25 22:57:13 +00:00
Shuzhen Wang
207867716a
Camera: Silence log spam
...
HAL is allowed to return captureResult from different thread contexts.
Do not do ALOGW if this is the case.
Test: Run camera and check logspam is gone
Bug: 62068207
Change-Id: I86e77fc578953cefecf10ebc4d395edf33627e8c
2017-05-25 11:21:09 -07:00
Eino-Ville Talvala
5f8d14e07d
Merge "camera.device@3.2 wrapper: Close release fence FDs" into oc-dev am: 1c20927f43
...
am: 86d314012e
Change-Id: Ic036732ddbd750d47915e3f033d1384499ccea6b
2017-05-25 01:58:54 +00:00
Eino-Ville Talvala
86d314012e
Merge "camera.device@3.2 wrapper: Close release fence FDs" into oc-dev
...
am: 1c20927f43
Change-Id: I81840052731f509509cde33ba773b5972ed08d66
2017-05-25 01:55:55 +00:00
Eino-Ville Talvala
4ebf53f450
camera.device@3.2 wrapper: Close release fence FDs
...
Freeing the native handle isn't enough; we need to close the fence FDs
after sending them to the camera service, since that's the behavior
that the legacy HAL interface requires.
Test: Camera CTS continues to pass.
Bug: 38482274
Change-Id: I879de566dcafecc1b899d79e68b38ea39b91a37e
2017-05-24 15:23:56 -07:00
Steven Moreland
7708449766
Update makefiles. (2/2) am: 76cfb84140
...
am: f203167814
Change-Id: I1f13401266f3c2f78c627088b09c79cd7c8d0276
2017-05-22 17:29:04 +00:00
Steven Moreland
f203167814
Update makefiles. (2/2)
...
am: 76cfb84140
Change-Id: I24d21438a5b2f447d2160929c6ff6e17b2b66820
2017-05-22 17:15:20 +00:00
Steven Moreland
76cfb84140
Update makefiles. (2/2)
...
Adds default configuration for all hals.
Bug: 38415912
Test: pass
Change-Id: Idd1f3a2b7b16ad956d31784a513e93a066cdd02e
2017-05-19 15:54:03 -07:00
Emilian Peev
8bdbf00a34
Camera: Remove binderized todo comment
...
The camera test cases already already run in binderized mode
for any devices that have this mode enabled.
Additionally remove the missing camera device todo as well.
This should be handled by the VTS infrastructure.
Camera provider service constant updated as well.
Bug: 38137798
Test: VtsHalCameraProviderV2_4TargetTest
Change-Id: I45ddf224dd4dac3ddfbbd751fa297e4631283537
2017-05-19 11:42:08 +01:00
Chih-Hung Hsieh
7eb57b60ab
Remove unused lambda capture
...
New clang compiler gives warning to unused lambda captures.
Apply clang-format.
Bug: 37423073
Test: Build
Change-Id: Icdf019df1a6c9dcadeb35551377d7afa09eebb3e
2017-05-15 14:02:45 -07:00
Steven Moreland
d09cf863da
Update makefiles for c++-sources and c++-headers. (2/2) am: bc71124120
...
am: a32ebce372
Change-Id: Ic1dd8f98e72656bc12a6e5224e541f75afb79daa
2017-05-11 01:38:14 +00:00
Martijn Coenen
ab97cef29e
Merge "Start processes that need real-time with CAP_SYS_NICE." into oc-dev am: 6c062f77c1
...
am: b05e4c9414
Change-Id: I9fa6d2b4283ca50506ffcc6a665e6a2e46c4c2f9
2017-05-11 01:36:26 +00:00
Steven Moreland
a32ebce372
Update makefiles for c++-sources and c++-headers. (2/2)
...
am: bc71124120
Change-Id: Icf36068a4d863a8520854c7a83e51f960c188e12
2017-05-11 00:48:55 +00:00
Martijn Coenen
b05e4c9414
Merge "Start processes that need real-time with CAP_SYS_NICE." into oc-dev
...
am: 6c062f77c1
Change-Id: I921160390dc9f90e7872729194ed1d1240ce68b7
2017-05-11 00:47:30 +00:00
Steven Moreland
4be51a8512
Merge changes from topic 'fix-hidl-generate' into oc-dev
...
* changes:
Update makefiles for c++-sources and c++-headers.
Update makefiles for c++-sources and c++-headers. (2/2)
2017-05-10 20:02:40 +00:00
Martijn Coenen
6c062f77c1
Merge "Start processes that need real-time with CAP_SYS_NICE." into oc-dev
2017-05-10 17:55:47 +00:00
Steven Moreland
bc71124120
Update makefiles for c++-sources and c++-headers. (2/2)
...
Test: pass
Bug: 38174080
Change-Id: Icad451f9f9ad5f46412356a4171a8a1222f8e545
2017-05-09 19:58:43 -07:00
Mathias Agopian
d8931ac871
fix circular dependency libnativewindow <-> libui
...
Bug: 37647680, 37648355
Test: compile, manual
Change-Id: I2fdec8e86f6729aadd572a250b9d55d77f0d4eef
2017-05-09 16:40:51 -07:00
Eino-Ville Talvala
933eb18785
Camera: Remove TODOs in interfaces am: 71619beef7
...
am: 569dbdc90e
Change-Id: I27e0bd177eabd9b61c42fd01c8c523a53f2441a6
2017-05-09 23:17:18 +00:00
Eino-Ville Talvala
1ad8ad8986
Merge "Camera: Clean up TODOs that aren't going to be addressed." into oc-dev am: 0b3d86e05a
...
am: e643da4e19
Change-Id: Ie8227d2db1667e60421ff88a65555260b426e16e
2017-05-09 23:16:57 +00:00
Eino-Ville Talvala
569dbdc90e
Camera: Remove TODOs in interfaces
...
am: 71619beef7
Change-Id: I43e85210ab1972f8245376831f578816be4dea78
2017-05-09 21:32:28 +00:00
Eino-Ville Talvala
e643da4e19
Merge "Camera: Clean up TODOs that aren't going to be addressed." into oc-dev
...
am: 0b3d86e05a
Change-Id: Ic0ca4e1eff6716466ef86bc6a660bc371da875d6
2017-05-09 21:32:10 +00:00
Eino-Ville Talvala
71619beef7
Camera: Remove TODOs in interfaces
...
These are tracked elsewhere and won't be addresed for the initial
interface versions.
Update current.txt hashes; comment-only update
Test: Compiles
Bug: 34108979
Bug: 33269977
Bug: 33262893
Change-Id: I0c0521cf69649d871f64a67773ce822db2487044
2017-05-09 11:32:27 -07:00
Martijn Coenen
f9b3fb49df
Start processes that need real-time with CAP_SYS_NICE.
...
Bug: 37293077
Test: verified CAP_SYS_NICE granted in /proc/pid/status
Change-Id: If404450cbeb077d331b231bda1af2d6eae774b75
2017-05-09 09:57:00 -07:00
Eino-Ville Talvala
e0a0a1c239
Camera: Clean up TODOs that aren't going to be addressed.
...
These TODOs aren't in scope for the wrapper libraries.
Leave the few TODOs that have bugs tracking them, and the ones that
are from autogenerated metadata.
Test: Builds
Bug: 34108979
Change-Id: Ib28467a4fbcfaab4a0809334bc62eabb9290797a
2017-05-08 15:29:28 -07:00
Steven Moreland
5c63b11f76
Remove redundant dependencies
...
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.
Test: links
Bug: 33276472
Merged-In: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 15:29:30 -07:00
Steven Moreland
2cd0d42d72
Remove redundant dependencies
...
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.
Test: links
Bug: 33276472
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 10:17:28 -07:00
TreeHugger Robot
ce9c1a6e62
Merge changes from topic 'fix_mess'
...
* changes:
Revert "Revert "android.hardware.camera.provider@2.4: set up /dev/vndbinder""
Revert "Revert "composer: route binder traffic over vndbinder""
2017-04-29 06:55:04 +00:00
Martijn Coenen
ca4c2c2226
Revert "Revert "android.hardware.camera.provider@2.4: set up /dev/vndbinder""
...
This reverts commit e6bc672921
.
Test: marlin boots, camera works
Bug: 37302783
Change-Id: I73eb18d56020e345a0e2d6e90961512281de6644
2017-04-28 22:04:24 +00:00
Yin-Chia Yeh
32eaa4b51a
Merge "Camera: use framework header for VideoNativeHandleMetadata" into oc-dev am: d4fc468392
...
am: c9ec7cc179
Change-Id: Ibed3f21770a48478bd16610828f24181179e1ca2
2017-04-28 08:10:12 +00:00
TreeHugger Robot
d4fc468392
Merge "Camera: use framework header for VideoNativeHandleMetadata" into oc-dev
2017-04-28 08:01:49 +00:00
Yin-Chia Yeh
feddd45722
Merge "Camera: use gralloc mapper for handle import" into oc-dev am: 02b745ff40
...
am: 8c0e9f19b2
Change-Id: Ie14587977306c05f1458cb47b6cc2d5c3f152f39
2017-04-28 02:16:01 +00:00
Emilian Peev
e7b05b0037
Merge changes from topic 'device_version_cleanup' into oc-dev am: 3176e6ebb9
...
am: 5649a3df94
Change-Id: I51b149bbec59f6e5bd7c9e8c865796a6a9ae96ad
2017-04-28 00:53:07 +00:00
Emilian Peev
c979af7610
Camera: Insert default RAW boost if needed am: a13ac99f34
...
am: 0c0270041a
Change-Id: Ifb5b24b52bdc7781cb7b09a81435819cc6de081f
2017-04-28 00:53:05 +00:00
Emilian Peev
137f358c4f
Camera: Override AE pre-capture trigger cancel am: cf5813702a
...
am: 2743c517f4
Change-Id: I4a52db4651641436d46a69fc311ed7be325c3522
2017-04-28 00:53:01 +00:00
Emilian Peev
1f7a228253
Camera: Map stream dataspaces am: 7d52a6fd25
...
am: 1b3d4f1574
Change-Id: I84e72cf54948edb2505c9e83127c3d48ac132395
2017-04-28 00:52:58 +00:00
Yin-Chia Yeh
1ee279df20
Camera: use framework header for VideoNativeHandleMetadata
...
Test: build
Bug: 35625849
Change-Id: I8159dd571b6b390fa089d497d45b76c1ec5bda31
2017-04-27 16:13:52 -07:00
TreeHugger Robot
02b745ff40
Merge "Camera: use gralloc mapper for handle import" into oc-dev
2017-04-27 23:00:50 +00:00
Yin-Chia Yeh
519c1675c3
Camera: use gralloc mapper for handle import
...
Bug: 37540361
Test: marlin, smoke test GCA
Change-Id: I9d58d9c6af20b37c016f036bce2dcf55817c59aa
2017-04-27 14:11:07 -07:00
Emilian Peev
c9ded51848
CameraProvider: Check camera device version
...
Make sure we are working with supported devices.
Bug: 34392075
Test: Manual using application
Change-Id: I834612303f3e02e79924efbdcc25cff890defefb
2017-04-25 20:05:41 +01:00
Emilian Peev
a13ac99f34
Camera: Insert default RAW boost if needed
...
RAW boost key inside result and request metadata could be
absent depending on CameraHal. In case RAW boost range is
supported, the RAW boost value must always be present.
Bug: 34392075
Test: runtest -x
cts/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
Change-Id: I4c27b3fe5228ff604e3f2796abc670be5c17da67
2017-04-25 20:04:25 +01:00
Emilian Peev
cf5813702a
Camera: Override AE pre-capture trigger cancel
...
CameraHal version 3.2 doesn't support cancel AE pre-capture
trigger. Camera request metadata that contains this value
needs to be overriden respectively. The corresponding results
also require the same kind of modification.
Bug: 34392075
Test: runtest -x
cts/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
-m testAePrecaptureTriggerCancelJpegCapture
Change-Id: If8bcf7e97ca8691cf890d5d6306d49dc3ddd087a
2017-04-25 20:04:19 +01:00
Emilian Peev
7d52a6fd25
Camera: Map stream dataspaces
...
Older CameraHal versions are still using deprecated dataspace
definitions. Mapping between these dataspaces is needed to avoid
discrepancies.
Bug: 34392075
Test: Manual using camera application
Change-Id: I811dec879494445736b4e3731b2d516e396a9058
2017-04-25 20:04:12 +01:00