Commit graph

951 commits

Author SHA1 Message Date
Tomasz Wasilczyk
353d4c5c75 Use String8/16 c_str [camera]
Bug: 295394788
Test: make checkbuild
Change-Id: I7ca371112e891f4f40673b5c34e3b8ccc41841bf
Merged-In: I7ca371112e891f4f40673b5c34e3b8ccc41841bf
2023-08-24 17:07:46 +00:00
Avichal Rakesh
e1390f059f camera: Fix prefix length path for External Camera HAL am: b8863f6a03
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2386907

Change-Id: I1ccf1ab9bc2520801b55741219def26675f381fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 01:31:57 +00:00
Avichal Rakesh
b8863f6a03 camera: Fix prefix length path for External Camera HAL
The default External Camera HAL accidentally used `sizeof` on a `char *`
to get the length of the string. This "worked" because the string in
question "/dev/" has length of 5, while on a 32-bit system `char *`
has a size of 4. This difference of 1 was handled a few lines later.

However on 64-bit system `sizeof(char *)` returns 8 which breaks the
logic later in code.

As `sizeof` was being used as a proxy for strlen, this CL converts the
uses C++'s std::char_traits::length to determine the string lengths
at compile time.

Bug: 265168485
Test: Manually tested that the calculated length is correct after the
      fix.
Change-Id: I92481a2bcb74fdbbb483ef552168debf07b2d68a
2023-06-08 17:00:35 -07:00
Steven Moreland
7967c1a9e4 Merge "Camera Provider VTS: auto-gen" am: 433f0ac41d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611867

Change-Id: I7de9f8d7e42a242ad88d72d55aa56a55e05d3951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 17:59:54 +00:00
Steven Moreland
a405bae2d1 Camera Provider VTS: auto-gen
Upload for stashing. I need to redownload/rebuild Android to test
the new feature.

Bug: N/A
Test: atest VtsAidlHalCameraProvider_TargetTest
Change-Id: Ic9aa621b6d3e1297c83add88283559915e36311e
2023-06-05 19:55:32 +00:00
Xin Li
71a948bc4c Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
Bug: 275386652
Merged-In: Icd15f6e7bfdd7b3e3d0d4b407195258d4171c560
Change-Id: I115d5b25fc5b997a76ac4672262945f3393a9c78
2023-04-18 16:34:16 -07:00
Shuzhen Wang
2603479470 Camera: VTS: Fix fence fd double close am: 3ad137edbb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2539830

Change-Id: I6f75051e3ac3bf9d3976969ead45da306d2ff10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 00:49:20 +00:00
Shuzhen Wang
3ad137edbb Camera: VTS: Fix fence fd double close
Fence fd is closed when processCaptureResult returns. In order to
wait for the release fence *after* processCaptureResult returns,
the fence fd needs to be duped.

Test: Vendor testing
Bug: 241281568
Change-Id: Ib74f9bb141802713b476a2ef48a2252125a7915d
2023-04-17 05:02:05 +00:00
Treehugger Robot
41e0286ba5 Merge "Camera: VTS: Wait for release fence before consuming buffers" into android13-tests-dev am: 1c8377c24c am: 13f7e14af3 am: 741506640a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2520900

Change-Id: Idaefcf5c650012829792b5db1760b90045dd653a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 18:47:40 +00:00
Treehugger Robot
13f7e14af3 Merge "Camera: VTS: Wait for release fence before consuming buffers" into android13-tests-dev am: 1c8377c24c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2520900

Change-Id: I02490da662338296bd76de6c9e39b8f590aae0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 17:34:13 +00:00
Treehugger Robot
1c8377c24c Merge "Camera: VTS: Wait for release fence before consuming buffers" into android13-tests-dev 2023-04-05 17:10:33 +00:00
Shuzhen Wang
b53e6ec5d2 Camera: Fix VTS failure for depth only camera am: 72f97643fb am: 3d44601e7f am: 86e38ac68e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2523160

Change-Id: I8177f8733c67615d347cad582380952250ced839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 03:19:43 +00:00
Shuzhen Wang
3d44601e7f Camera: Fix VTS failure for depth only camera am: 72f97643fb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2523160

Change-Id: I849cf4e48e18cc88ec6e62eb4066f2ff05887fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 02:07:10 +00:00
Shuzhen Wang
72f97643fb Camera: Fix VTS failure for depth only camera
If the device is depth-only, use threshold with Y16 format rather than
IMPLEMENTATION_DEFINED.

This fixes the regression introduced by the fix for b/265984260.

Bug: 276957901
Test: atest VtsAidlHalCameraProvider_TargetTest
Change-Id: If9023f1ed17bb761abbb9be36e567264f8bf0689
2023-04-04 20:57:27 +00:00
Shuzhen Wang
0f56c56709 Camera: VTS: Wait for release fence before consuming buffers
The camera HAL may signal release fence after processCaptureResult.
If the VTS test waits for the release fence in the context of the
capture result, there is possibility of deadlock.

Rather, we should wait for the releaseFence in a different thread
context to really emulate the real application behavior.

Test: atest VtsAidlHalCameraProvider_TargetTest
Bug: 241281568
Change-Id: Id1d92e901aae1cab084846d252ef090fcda182d7
2023-04-04 16:45:28 +00:00
Shuzhen Wang
22bee670eb Merge "Camera VTS: Override RotateAndCrop metadata" into android13-tests-dev am: 74a4696d56 am: db5e0c9852 am: fbf372d99e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2450127

Change-Id: I89b2790bb764fb3d76f99d10e77de31d5eb399d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 22:12:09 +00:00
Shuzhen Wang
db5e0c9852 Merge "Camera VTS: Override RotateAndCrop metadata" into android13-tests-dev am: 74a4696d56
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2450127

Change-Id: I6d4545e2567ac8a3650c98dcc0f4079cc011c52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 20:53:20 +00:00
Michelle Ho
388d4ffb3b Camera VTS: Override RotateAndCrop metadata
Per camera metadata definition, ROTATE_AND_CROP_AUTO will never be sent
to the HAL, as camera service takes reponsibility of translating AUTO to
specific rotation value. So for VTS tests, we should always override
the metadata in CaptureRequest.

Bug: 270052579
Test: Run VtsAidlHalCameraProvider_TargetTest
Change-Id: I96f4992e145da25c463b0b406aa2a371af30f41f
2023-02-22 10:19:13 +00:00
Treehugger Robot
0dd6f62f61 Merge "Camera VTS: Remove unnecessary test of Y16 depth format" into android13-tests-dev am: ca60e0b71f am: 915fde07bd am: f862766f37
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2402628

Change-Id: I7acb9527ae60468dcdf502aec8241a67c7992150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 02:49:08 +00:00
Treehugger Robot
915fde07bd Merge "Camera VTS: Remove unnecessary test of Y16 depth format" into android13-tests-dev am: ca60e0b71f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2402628

Change-Id: I33e7a4a8a099026cf91910af33f3be0bd7dfe6f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 01:16:47 +00:00
Treehugger Robot
ca60e0b71f Merge "Camera VTS: Remove unnecessary test of Y16 depth format" into android13-tests-dev 2023-02-09 00:44:15 +00:00
Shuzhen Wang
cd3c483ab0 Camera VTS: Remove unnecessary test of Y16 depth format
getAvailableOutputStreams() shouldn't unconditionally add Y16 stream
configurations. Instead, if the threshold being passed in is valid,
getAvailableOutputStreams() should use the threshold's format
instead.

Test: Run VTS on pixel; vendor testing.
Bug: 265984260
Change-Id: I3c8119c6032141bb6e2f95f060f014a13340d16b
2023-02-08 21:56:51 +00:00
Treehugger Robot
dff7304e4a Merge "Camera VTS: Keep buffer ids and frame numbers consistent" into android13-tests-dev am: ceeef2d2bf am: d627f61ecc am: d565a1b987
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2393593

Change-Id: Idf8f23a6a164a53dfa55fc50b1803f599be0691d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 01:54:19 +00:00
Treehugger Robot
d627f61ecc Merge "Camera VTS: Keep buffer ids and frame numbers consistent" into android13-tests-dev am: ceeef2d2bf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2393593

Change-Id: Iab70382aa05ec5812520cb60f79b689184ffb413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 23:05:52 +00:00
Treehugger Robot
ceeef2d2bf Merge "Camera VTS: Keep buffer ids and frame numbers consistent" into android13-tests-dev 2023-01-25 22:25:06 +00:00
Emilian Peev
470d138062 Camera VTS: Keep buffer ids and frame numbers consistent
In case we have a camera device that doesn't support the
Hal buffer management mode, services are required to use
the frame number and stream id to deduce the specific
buffer id and Hals are not mandated to return valid
buffer ids as part of the capture result.

Bug: 265092659
Test:adb shell
/data/nativetest64/VtsAidlHalCameraProvider_TargetTest/VtsAidlHalCameraProvider_TargetTest
--gtest_filter=PerInstance/CameraAidlTest.process10BitDynamicRangeRequest/0_android_hardware_camera_provider_ICameraProvider_internal_0

Change-Id: I3b10e91d38a13afcca45f26712cc5d5c241c2a32
2023-01-25 11:07:37 -08:00
Treehugger Robot
8c763402a9 Merge "Camera VTS: Fix AIDL status typo" into android13-tests-dev am: 1c4170754f am: 98a65f23f0 am: 4761bc032e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2397737

Change-Id: I118189986d36de10f8ec55aec3dee8c2099d000d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 04:08:12 +00:00
Treehugger Robot
98a65f23f0 Merge "Camera VTS: Fix AIDL status typo" into android13-tests-dev am: 1c4170754f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2397737

Change-Id: I41ac1e6f5f871ca24aace3a1086dd5b24fbd3c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 02:36:52 +00:00
Treehugger Robot
2e55ef7ef5 Merge "cleanup camera OWNERS" am: 5a412d3e11 am: 48b05132ec
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2393024

Change-Id: Ie6bcb1e5b2374d273b0672086c6e40db6208eef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 22:10:17 +00:00
Emilian Peev
7195938fe2 Camera VTS: Fix AIDL status typo
"physicalCameraDeviceStatusChange" returns a default
ScopedAStatus that will not include a valid AStatus instance.
This will result in binder instabilities once the status
is being parceled.
Return "ScopedAStatus::ok" instead.

Bug: 253993253
Test: adb shell VtsAidlHalCameraProvider_TargetTest
Change-Id: I219f608a04aaec0631e3de58a7e0d47a30294e52
2023-01-20 13:57:17 -08:00
Steven Moreland
2533048e88 cleanup camera OWNERS
I wrote a script for this, see my email
"introducing: ownersfix.py - basic cleaning script for simple OWNERS files"

Bug: 265168485
Test: N/A
Merged-In: I47ab60785b193764a96d7b63820c87ec4fa81f7f
Change-Id: I47ab60785b193764a96d7b63820c87ec4fa81f7f
2023-01-18 21:06:05 +00:00
Treehugger Robot
5202a42619 Merge "Limit LOG_TAG in header" am: 248026347f am: 7b33b192c0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2382934

Change-Id: I2a527654b0ab73a369b0d7ae8c3e4f990421ed01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11 21:03:22 +00:00
Ravneet Dhanjal
eb30591704 Validate request metadata before coverting to camera metadata am: df9ea6e679
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/20918704

Change-Id: I2479b00f72ed1e9478113aed26417cd95c2bc4a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11 00:17:03 +00:00
Steven Moreland
9c8b6b21ff Limit LOG_TAG in header
Including LOG_TAG in a header prevents any files which uses
this header from defining a LOG_TAG.

Bug: 259162245
Change-Id: I847f4b4f8898aac373db2566c745d3e73404f58a
Merged-In: I847f4b4f8898aac373db2566c745d3e73404f58a
2023-01-10 18:56:35 +00:00
Ravneet Dhanjal
df9ea6e679 Validate request metadata before coverting to camera metadata
- Backport similar fix from AIDL to HIDL to protect
from malformed metadata

Bug: 256166626
Test: CTS test
Change-Id: If8f83520144824e38ed102b7468d6d5ee2e6d963
2023-01-09 22:09:25 +00:00
Steven Moreland
000068d6d9 specify import version (camera)
Required to automate AIDL finalization - makes errors show up
now instead of later.

Bug: 188871598
Test: build
Change-Id: Ia38678a7dbc0abc0c0d19fa0794f0f80b2638156
Merged-In: I382dea5d13582817959001246240141e83d8172d
2022-12-28 18:59:04 +00:00
Steven Moreland
945c90f7f5 Mark modules frozen explicitly (II)
Makes it easier to see which versions are available.

Bug: 188871598
Test: N/A
Merged-In: Ica76a8225fec8dc5267362cbfd43e06e65ad3f1e
Change-Id: I8c091237478e4b095ce4be280ae5d6fbcd0b7152
2022-12-23 02:33:24 +00:00
Xin Li
34eab1cf79 Merge Android 13 QPR1
Bug: 261731544
Merged-In: I4fe9ddd1c22ebfff03f5660ec9b01de2521f8533
Change-Id: Ic59ecf4fbb0438607c4069829426fbdfa7c7abd1
2022-12-09 10:29:52 -08:00
Marc Kassis
9c428fe3ed graphics.common V3 -> V4
Bug: 251177105
Test: m
Change-Id: I816b8e14a0741402090cdc4732c2a904e830ff4e
Merged-In: I1cb84ec85f98789d0737207a1661b39a25538c96
Merged-In: I2e1561f4ccb59a2a833af9a7afd07840ab2ebfa4
2022-12-07 10:53:12 +00:00
Treehugger Robot
db93905f18 Merge "Add pointer to default AIDL Camera HAL Implementation in README.md" am: 14762528b0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2300028

Change-Id: Ib5ee7b72bde9bf53e1a91dc41add4c55e5ae1c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 17:05:43 +00:00
Treehugger Robot
14762528b0 Merge "Add pointer to default AIDL Camera HAL Implementation in README.md" 2022-11-14 16:32:20 +00:00
Jayant Chowdhary
752fc7d851 Add pointer to default AIDL Camera HAL Implementation in README.md
Bug: 258543462

Test: N/A

Change-Id: Iec00fd6ffa9422ccc5a664d419e658dcb01bfbcc
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-11-13 04:29:49 +00:00
Steven Moreland
eea598ddce camera aidl: 'empty' native handles not 'null' native handles am: 29b87463f4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2250554

Change-Id: I2148508663f577884f2352d6de5580f277b968e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 01:35:06 +00:00
Steven Moreland
29b87463f4 camera aidl: 'empty' native handles not 'null' native handles
Bug: N/A
Change-Id: I789d90e2c3d73a57658fbcc7a87723251f9c9096
Test: N/A
2022-10-11 22:45:18 +00:00
kongchenrui
fccc9c8fed Fix the problem that the data field of Entry in the verifyLogicalOrUltraHighResCameraMetadata function is empty am: 7549241c15 am: 65ebae18f7 am: c1065f69fa am: 118393954c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2228941

Change-Id: I9cd88b4e63900ed1ebc3d7182c021a16dbac17ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 22:45:06 +00:00
kongchenrui
65ebae18f7 Fix the problem that the data field of Entry in the verifyLogicalOrUltraHighResCameraMetadata function is empty am: 7549241c15
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2228941

Change-Id: I102d6c279198f701576e3831983404d96a9a613e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 21:17:50 +00:00
kongchenrui
7549241c15 Fix the problem that the data field of Entry in the verifyLogicalOrUltraHighResCameraMetadata function is empty
The reason for this problem is: local variables are used when saving
PhysicalCameraCharacteristics. When its life cycle ends, physChars will
be released. Since Entry uses a pointer, data will be null. So physChars
should be defined outside else to ensure that physChars is not released
during use

Bug: 248221707
Test: VtsHalCameraProviderV2_4TargetTest
Test: VtsAidlHalCameraProvider_TargetTest
Signed-off-by: kongchenrui <kongchenrui@xiaomi.com>
Change-Id: I4c05e695d255f210f310f8ce78ec2fa71a42cee9
2022-09-28 20:35:55 +00:00
Xin Li
7406132b49 Merge android13-tests-dev
Merged-In: Ie372f74f3a52decce592181c7d65624f8ec03ed1
Change-Id: Ia81e24391de0d26737a5d65fbc5c8bb86bf03d5b
2022-08-17 16:37:46 -07:00
TreeHugger Robot
58f71f3599 Merge "Camera: Import gralloc buffers before metadata queries" into stage-aosp-tm-ts-dev am: f9daf08b7b am: ee100afbbd am: 2d5d3855ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19125050

Change-Id: Icb57c2106ef02bc7ee629a1bfbaf005bc82461be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:30:13 +00:00
TreeHugger Robot
2d5d3855ed Merge "Camera: Import gralloc buffers before metadata queries" into stage-aosp-tm-ts-dev am: f9daf08b7b am: ee100afbbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19125050

Change-Id: Ib81bd2c22beb4c1ae50f90bf0ffe6d00252e2a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:12:49 +00:00