Commit graph

1208 commits

Author SHA1 Message Date
Chia-I Wu
7ca92515be Revert "graphics: improve preloading for IMapper default impl"
This reverts commit 6d189b71a2.

Reason for revert: b/273884219, beagle_x15

Change-Id: I9706fc46f9aedbeb4bbcff7ebcb45939bcd20680
2023-03-20 16:36:56 +00:00
Chia-I Wu
6d189b71a2 graphics: improve preloading for IMapper default impl
When GraphicBufferMapper::preloadHal dlopens the default impl, make sure
the gralloc module is also dlopen'ed.

Bug: 269664560
Test: android.view.cts.PixelCopyTest#testVideoProducer on grunt

Change-Id: I57418338d5212fb9a2c1ea82eba63d855f69ff32
2023-02-27 14:19:12 -08:00
Alec Mouri
bedde5e845 Check the correct sysprop for P010 support for gralloc 3 and 4. am: 960c14db22
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2441523

Change-Id: I86b2df035255b94e8a682c1870efea0df450aec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-18 02:10:40 +00:00
Alec Mouri
960c14db22 Check the correct sysprop for P010 support for gralloc 3 and 4.
We need to check the first api level that the vendor shipped with.

Also check P010 support in the preamble of the relevant test rather than in allocate(), since otherwise either allocate() may incorrectly skip some tests or allocate() may succeed but with the wrong layout information.

Bug: 257442231
Test: VtsHalGraphicsMapperV4_0TargetTest
Change-Id: I00ae5aa01117704158c38f0689e91df99473e208
Merged-In: I00ae5aa01117704158c38f0689e91df99473e208
2023-02-16 23:16:14 +00:00
Yi Kong
07448c2929 Fix compiler warning discovered by clang-r484482
external/googletest/googletest/include/gtest/gtest.h:1545:11: error: invalid operands to binary expression ('const std::vector<unsigned char>' and 'const android::hardware::hidl_vec<unsigned char>') [clang-diagnostic-error]
  if (lhs == rhs) {
      ~~~ ^  ~~~

Test: presubmit
Change-Id: Iabe98a58d5dc5b9943c38240da2d8df6ac61fb7f
2023-01-26 01:23:03 +09:00
Treehugger Robot
d2bbda8b32 Merge "Drop <name>I</name> from mapper HAL." 2023-01-20 17:10:47 +00:00
Yifan Hong
ccb250d550 Drop <name>I</name> from mapper HAL.
libvintf now supports empty interface names for native HALs.

Test: TH
Bug: 264267049
Change-Id: Ie525478631e785ce8b9d813d08b0a92331047ced
2023-01-17 15:23:32 -08:00
Sally Qi
2b42a74573 Merge "Remove length check to allow empty HDR10+ blobs to HWC" 2023-01-13 18:24:15 +00:00
Sally Qi
2060a4e647 Remove length check to allow empty HDR10+ blobs to HWC
Bug: 212496177
Test: builds
Change-Id: Iad121cd6515e826c4b57976b14e7a5eb947b1728
2023-01-10 11:11:54 -08:00
John Reck
0c1a059f01 Clarify format BLOB locking
Bug: 162571907
Test: n/a doc only change
Change-Id: I3ab26cee8a790067447781e13062c62fc3b7c01c
2023-01-10 11:25:56 -05:00
John Reck
a190be3f86 Clarify deprecation message
Note that it's still used if mapper@4 is still used

Test: n/a doc only change
Change-Id: I21d3070684592f2931842acb43466ae4236856e6
2023-01-10 10:56:00 -05:00
Shubhangi Pawar
3e1907ae4a Merge "composer: vts: Init display dimension using active config" into android13-tests-dev 2023-01-09 18:59:00 +00:00
John Reck
a74147236c Merge "Add a README and a standardizable VERSION" 2023-01-09 18:38:26 +00:00
Treehugger Robot
0a9430add2 Merge "Add ExtendableType to allocate" 2023-01-09 08:05:54 +00:00
HyunKyoung
37b3413684 composer: vts: Init display dimension using active config
Dimension was initialized to the size of the last config that is in the config list.
VTS didn't change the dimension in the readback test and allocated buffer
for the readback with the dimension size.
However it was different with actual display size.
This change initializes display dimension to the actual display size.

Bug: 259155172
Change-Id: I64fec02f5386eb6ca1f41ab376be193231810b93
Merged-In: I64fec02f5386eb6ca1f41ab376be193231810b93
Signed-off-by: HyunKyoung <hk310.kim@samsung.com>
2023-01-09 04:56:06 +00:00
Treehugger Robot
12c9d664aa Merge "composer: vts: Init display dimension using active config" 2023-01-09 04:51:54 +00:00
John Reck
0124abc1e9 Add a README and a standardizable VERSION
* Changes the compatbility matrix version to 5.0 & marks optional
* Tweaks the interface name in case it doesn't get removed soon
  (otherwise readme looks silly)
* Adds a README.md to mapper/stable-c
* Adds VTS test to validate versions match

Test: build + mapper VTS

Change-Id: I9b1256e07aaf2876d579a5487d2051c60097fb70
2023-01-06 17:40:16 -05:00
John Reck
cf8d8bc769 Add ExtendableType to allocate
Allows for passing arbitrary additional options to IAllocator
Can be used to control things such as compression level without
exhausting usage bits

Currently there are no standard options defined so this only allows
for vendor-internal extensions currently.

Fixes: 257075040
Test: VtsHalGraphicsAllocatorAidl_TargetTest
Change-Id: I37b730f5ba141b08d458866c6d03a39b27124e02
2023-01-06 15:43:27 -05:00
John Reck
0797e36036 Merge "Add stride query" 2023-01-06 19:38:30 +00:00
HyunKyoung
4775bdce26 composer: vts: Init display dimension using active config
Dimension was initialized to the size of the last config that is in the config list.
VTS didn't change the dimension in the readback test and allocated buffer
for the readback with the dimension size.
However it was different with actual display size.
This change initializes display dimension to the actual display size.

Bug: 259155172
Change-Id: I64fec02f5386eb6ca1f41ab376be193231810b93
Signed-off-by: HyunKyoung <hk310.kim@samsung.com>
2023-01-05 10:17:34 +09:00
John Reck
2c2cfc9341 Add stride query
Fixes: 261856851
Test: VtsHalGraphicsMapperStableC_TargetTest

Change-Id: Ib49df2d46dd55848c4854179bd6205c86c232a6d
2023-01-04 16:41:26 -05:00
Trevor Black
3e01679bb5 Merge "The aidl changes necessary to add requested AHB format enums" 2022-12-21 00:24:27 +00:00
Trevor David Black
060a59992d The aidl changes necessary to add requested AHB format enums
PIXEL_FORMAT_R_16_UINT
- AHARDWAREBUFFER_FORMAT_R16_UINT
PIXEL_FORMAT_RG_1616_UINT
- AHARDWAREBUFFER_FORMAT_R16G16_UINT
PIXEL_FORMAT_RGBA_10101010
- AHARDWAREBUFFER_FORMAT_R10G10B10A10_UNORM

Bug: 233033456
Test: Build
Change-Id: I7b9829f549dd6d931531f14fef458d1fecc82ac9
2022-12-15 19:18:11 +00:00
John Reck
0e4732c1a5 Adjust IMapperMetadataTypes.h to match gralloc4 encoding
Specifically include the header encoding. Initially
omitted as it's a bit redundant, the value in having
bit-for-bit identical encoding between gralloc4 &
imapper5 seems worthwhile enough to keep it.

Test: impltests + VtsHalGraphicsMapperStableC
Change-Id: Iee37bb97acf40362c301a06f9118938b1a0c2cd9
2022-12-15 13:50:07 -05:00
John Reck
749f5af092 Add some more tests & tweak spec around SMPTE2094-40
Test: this
Change-Id: If7c549b8efcf490859f10c225a700188b76a54fa
2022-12-15 13:49:55 -05:00
Steven Moreland
2e37f01273 Merge "graphics.common V3 -> V4" 2022-12-09 17:21:59 +00:00
Sally Qi
ab88d5cac3 Merge "Expose COLOR_MODE_DISPLAY_BT2020." 2022-12-08 17:00:12 +00: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
Sally Qi
d43651c2a8 Expose COLOR_MODE_DISPLAY_BT2020.
Bug: 256551001
Test: build and flash; hidl-gen -L hash
android.hardware:hardware/interfaces
android.hardware.graphics.common@1.2::types >> current.txt

Change-Id: I33116c1b31bd981b04489bc9704a54e97332aed7
2022-12-01 22:07:33 -08:00
John Reck
4346ad0f75 Merge "IMapper 5 - the Stable C approach" 2022-12-01 23:48:40 +00:00
John Reck
97f313746f IMapper 5 - the Stable C approach
Test: make VtsHalGraphicsMapperStableC_TargetTest VtsHalGraphicsAllocatorAidl_TargetTest

Change-Id: I910b27f388e3fb7261425dd4b2133885c05edd37
Merged-In: I910b27f388e3fb7261425dd4b2133885c05edd37
2022-12-01 17:37:59 +00:00
Steven Moreland
558762c14d allocator frozen false
magic -> explicit

Bug: 259465531
Test: N/A
Merged-In: I56b04a0f682a0ba3dc58a42c0a14bb506591c594
Change-Id: I56b04a0f682a0ba3dc58a42c0a14bb506591c594
(cherry picked from commit f65553745b)
2022-11-23 21:29:48 +00:00
Midas Chien
1120a6f78c composer: vts: configure layer for DisplayDecoration
Some HW may not support crop function for decoration and current API
can't query this capability. Configure decoration layer to full screen
to avoid this limitation.

Bug: 225765061
Bug: 259505289
Test: VtsHalGraphicsComposer3_TargetTest
--gtest_filter=*DisplayDecoration*

Change-Id: If47154adf9d48f9c1b8390b4bee090d8bf40ff3b
(cherry picked from commit 7d55d4269d)
Merged-In: If47154adf9d48f9c1b8390b4bee090d8bf40ff3b
(cherry picked from commit 308f4ac906)
Merged-In: If47154adf9d48f9c1b8390b4bee090d8bf40ff3b
2022-11-22 18:06:39 +08:00
Steven Moreland
e9d1bca6d7 Merge "composer3 frozen" 2022-11-21 20:30:28 +00:00
Steven Moreland
576e098973 composer3 frozen
magic -> explicit

Bug: 259465531
Test: build
Merged-In: Iefdfe812fc9309a0a758eedb3da9d3676e956f02
Change-Id: Icc336c6640adc064e755ab23c934d7d07cc6339f
2022-11-19 04:26:01 +00:00
Treehugger Robot
3777e1cb44 Merge "a.h.graphics.common frozen true" 2022-11-19 00:51:08 +00:00
Steven Moreland
3bc7a4937d a.h.graphics.common frozen true
magic -> explicit

Bug: 259465531
Test: build
Merged-In: I080bee98df6d4ad8799dd60c5090c2e79244ce2f
Change-Id: I3223d33c296c73e7c14e8ed87806ba6ed8ff3392
2022-11-18 20:11:02 +00:00
Steven Moreland
00ba1e951d android.hardware.graphics.allocator - VNDK - use V1
Breaking SDK finalization.

Bug: 259146177
Change-Id: I637ab649cbd1d0c886c91859398888f22025b963
Test: N/A
2022-11-17 00:07:44 +00:00
Treehugger Robot
38bd71130e Merge "Preemptive minimal import" 2022-11-16 03:09:04 +00:00
John Reck
1dd64b4f83 Preemptive minimal import
Just to handle conflicts from internal

Test: make
Merged-In: I6fbc22272ba95b44aa09ff08f9d9a7adbb9ae8be
Change-Id: Ibe3ca5c654057b60fa9f045e6fc1f39d14463b44
2022-11-15 16:27:54 -05:00
Treehugger Robot
e42d6d0bb9 Merge "Remove unused include Util.h." 2022-11-02 18:57:18 +00:00
John Reck
15703c76af Update OWNERS
Remove all subfolder OWNERS in favor of single top-level
Update top-level OWNERS

Fixes: 230785548
Test: n/a

Change-Id: I9e4f4fa7938e31f0caf864836889f8ebb5ca5675
2022-11-02 12:36:41 -04:00
Rachel Lee
c85172b200 Remove unused include Util.h.
Util.h is not used in ComposerServiceWriter so it should not be
included. Otherwise when using ComposerServiceWriter, Util.h is not
found in the local directory.

Bug: 255623263
Test: m
Test: flashall to device

Change-Id: I4ce57b37d6a9a899d114e5ac64d443cfa51d826a
Merged-In: I4ce57b37d6a9a899d114e5ac64d443cfa51d826a
2022-11-01 17:17:11 +00:00
Sally Qi
a1c66a2993 Add cc_defaults wrapper for android.hardware.graphics.allocator ndk
package.

- to avoid manually rev up if needed.

Bug: 243429120
Test: builds
Change-Id: I25bfcc203cda61af308c37c3766fa9efe6c6784c
Merged-In: I25bfcc203cda61af308c37c3766fa9efe6c6784c
2022-10-20 18:27:12 -04:00
Jason Macnak
866abc15d9 Support P010 with Gralloc2 on Gralloc1 passthrough
... by updating the toYCbCrLayout function to more closely follow
the requirements found in the comments of `android_flex_plane_t`.

Bug: b/244411455
Test: untested.
Change-Id: I1173253e25583336bf480160d4f6ac9f72882971
2022-09-14 13:10:22 -07:00
JihCheng Chiu
d0dbe4ef03 fix segmentation fault of GraphicsComposerAidlCommandTest
When we run the VTS of GraphicsComposerAidlCommandTest, we always meet
segmentation fault issue in some test items. VTS test items crashed
when it deleted the layer or display from resource manager and try to
go next loop.
The problem is the test item try to delete the layer iterator or
display iterator in the loop, so the iterator become an invalid
iterator. Then it try to use the invalid iterator for going to next
iterator. This behavior caused segmentation fault. We use different
way to fix deleting layer and deleting display.
Delete layer: Test item always delete all layer for each display, so
              we always delete layer via get the first iterator until
              the resource manager is empty.
Delete display: Test item only delete virtual display, so we move the
                physical display to a temporary map. After delete all
                virtual display, we swap the temporary map and
                original map.

Bug: 243781450
Test: 1. test GraphicsComposerAidlCommandTest.SetLayerColorTransform
         for deleting layer
      2. test GraphicsComposerAidlCommandTest.SetOutputBuffer
         for deleting disply

Change-Id: Id467df658e78ed29fdfc039cabc119f8bf62d69d
2022-08-26 02:11:23 +00:00
JihCheng Chiu
10750526a6 fix segmentation fault of GraphicsComposerAidlCommandTest
When we run the VTS of GraphicsComposerAidlCommandTest, we always meet
segmentation fault issue in some test items. VTS test items crashed
when it deleted the layer or display from resource manager and try to
go next loop.
The problem is the test item try to delete the layer iterator or
display iterator in the loop, so the iterator become an invalid
iterator. Then it try to use the invalid iterator for going to next
iterator. This behavior caused segmentation fault. We use different
way to fix deleting layer and deleting display.
Delete layer: Test item always delete all layer for each display, so
              we always delete layer via get the first iterator until
              the resource manager is empty.
Delete display: Test item only delete virtual display, so we move the
                physical display to a temporary map. After delete all
                virtual display, we swap the temporary map and
                original map.

Bug: 243781450
Test: 1. test GraphicsComposerAidlCommandTest.SetLayerColorTransform
         for deleting layer
      2. test GraphicsComposerAidlCommandTest.SetOutputBuffer
         for deleting disply

Change-Id: Id467df658e78ed29fdfc039cabc119f8bf62d69d
2022-08-25 12:21:47 +00:00
William Escande
2591c3d0cf [Bluetooth apex] Use new apex name
The Bluetooth apex name is now called com.android.btservices

Bug: 243054261
Test: Build
Change-Id: Ib63646722cbef948b5198fc5f2a9b5ac2ca52ae3
2022-08-22 11:27:58 -07:00
Xin Li
035ee7b933 DO NOT MERGE - Merge TP1A.220624.013
Merged-In: I25e8f827645db8e83c8c3142f5e76a912fdf7b22
Change-Id: Iabfc2e451749cbfe858e7bca6492565bf020d878
2022-07-11 21:47:42 -07:00
Midas Chien
8c75b834f4 composer: vts: configure layer for DisplayDecoration
Some HW may not support crop function for decoration and current API
can't query this capability. Configure decoration layer to full screen
to avoid this limitation.

Bug: 225765061
Test: VtsHalGraphicsComposer3_TargetTest
--gtest_filter=*DisplayDecoration*

Change-Id: If47154adf9d48f9c1b8390b4bee090d8bf40ff3b
(cherry picked from commit 7d55d4269d)
Merged-In: If47154adf9d48f9c1b8390b4bee090d8bf40ff3b
(cherry picked from commit 308f4ac906)
Merged-In: If47154adf9d48f9c1b8390b4bee090d8bf40ff3b
2022-06-29 00:03:45 +00:00