diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-18 03:23:42 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-18 03:23:42 +0000 |
commit | c2521a11160e84e2bc02978340d86e5c13b9c181 (patch) | |
tree | f2177ff96c07139617b0b720a280392c05dac0db | |
parent | d72cd3682541206dc5773c20ce81e3813d41d575 (diff) | |
parent | 530fa7832a003873eb1bd5ae757ff602ca3efed0 (diff) | |
download | gchips-c2521a11160e84e2bc02978340d86e5c13b9c181.tar.gz |
Snap for 9771082 from 530fa7832a003873eb1bd5ae757ff602ca3efed0 to udc-d1-release
Change-Id: I9aef3ada02f1d0313f8d692899afcc5ea90a44af
-rw-r--r-- | gralloc4/service/aidl/service.cpp | 2 | ||||
-rw-r--r-- | gralloc4/src/core/format_info.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gralloc4/service/aidl/service.cpp b/gralloc4/service/aidl/service.cpp index b6ccd44..515a31d 100644 --- a/gralloc4/service/aidl/service.cpp +++ b/gralloc4/service/aidl/service.cpp @@ -19,7 +19,7 @@ int main() { AIBinder_setMinSchedulerPolicy(binder.get(), SCHED_NORMAL, -20); const auto instance = std::string() + GrallocAllocator::descriptor + "/default"; - auto status = AServiceManager_addServiceWithFlag(binder.get(), instance.c_str(), + auto status = AServiceManager_addServiceWithFlags(binder.get(), instance.c_str(), AServiceManager_AddServiceFlag::ADD_SERVICE_ALLOW_ISOLATED); if (status != STATUS_OK) { ALOGE("Failed to start AIDL gralloc allocator service"); diff --git a/gralloc4/src/core/format_info.cpp b/gralloc4/src/core/format_info.cpp index b993f16..d27d204 100644 --- a/gralloc4/src/core/format_info.cpp +++ b/gralloc4/src/core/format_info.cpp @@ -112,8 +112,8 @@ const format_info_t formats[] = { { ID(HAL_PIXEL_FORMAT_EXYNOS_YCbCr_420_SPN_10B_SBWC_L80), .npln = 2, .ncmp = { 1, 2, 0 }, .bps = 10, .bpp_afbc = { 0, 0, 0 }, .bpp = { 16, 32, 0 }, .hsub = 2, .vsub = 2, .align_w = 2, .align_h = 2, ALIGN_W_CPU_DEFAULT, .tile_size = 1, .has_alpha = false, .is_rgb = false, .is_yuv = true, .afbc = false, .linear = true, .yuv_transform = false, .flex = true, .planes_contiguous = false }, /* Google Formats */ - { ID(HAL_PIXEL_FORMAT_GOOGLE_NV12_SP), .npln = 2, .ncmp = { 1, 2, 0 }, .bps = 8, .bpp_afbc = { 0, 0, 0 }, .bpp = { 8, 16, 0 }, .hsub = 2, .vsub = 2, .align_w = 64, .align_h = 8, .align_w_cpu = 64, .tile_size = 1, .has_alpha = false, .is_rgb = false, .is_yuv = true, .afbc = false, .linear = true, .yuv_transform = false, .flex = true, .planes_contiguous = true }, - { ID(HAL_PIXEL_FORMAT_GOOGLE_NV12_SP_10B), .npln = 2, .ncmp = { 1, 2, 0 }, .bps = 10, .bpp_afbc = { 0, 0, 0 }, .bpp = { 16, 32, 0 }, .hsub = 2, .vsub = 2, .align_w = 64, .align_h = 8, .align_w_cpu = 64, .tile_size = 1, .has_alpha = false, .is_rgb = false, .is_yuv = true, .afbc = false, .linear = true, .yuv_transform = false, .flex = true, .planes_contiguous = true }, + { ID(HAL_PIXEL_FORMAT_GOOGLE_NV12_SP), .npln = 2, .ncmp = { 1, 2, 0 }, .bps = 8, .bpp_afbc = { 0, 0, 0 }, .bpp = { 8, 16, 0 }, .hsub = 2, .vsub = 2, .align_w = 64, .align_h = 16, .align_w_cpu = 64, .tile_size = 1, .has_alpha = false, .is_rgb = false, .is_yuv = true, .afbc = false, .linear = true, .yuv_transform = false, .flex = true, .planes_contiguous = true }, + { ID(HAL_PIXEL_FORMAT_GOOGLE_NV12_SP_10B), .npln = 2, .ncmp = { 1, 2, 0 }, .bps = 10, .bpp_afbc = { 0, 0, 0 }, .bpp = { 16, 32, 0 }, .hsub = 2, .vsub = 2, .align_w = 64, .align_h = 16, .align_w_cpu = 64, .tile_size = 1, .has_alpha = false, .is_rgb = false, .is_yuv = true, .afbc = false, .linear = true, .yuv_transform = false, .flex = true, .planes_contiguous = true }, { ID(HAL_PIXEL_FORMAT_GOOGLE_R_8), .npln = 1, .ncmp = { 1, 0, 0 }, .bps = 8, .bpp_afbc = { 8, 0, 0 }, .bpp = { 8, 0, 0 }, .hsub = 0, .vsub = 0, .align_w = 16, .align_h = 16, .align_w_cpu = 16, .tile_size = 1, .has_alpha = false, .is_rgb = true, .is_yuv = false, .afbc = true, .linear = true, .yuv_transform = false, .flex = true, .planes_contiguous = false }, { ID(HAL_PIXEL_FORMAT_GOOGLE_RG_88), .npln = 1, .ncmp = { 2, 0, 0 }, .bps = 8, .bpp_afbc = { 16, 0, 0 }, .bpp = { 16, 0, 0 }, .hsub = 0, .vsub = 0, .align_w = 16, .align_h = 16, .align_w_cpu = 16, .tile_size = 1, .has_alpha = false, .is_rgb = true, .is_yuv = false, .afbc = true, .linear = true, .yuv_transform = false, .flex = true, .planes_contiguous = false }, /* END ALIGNED SECTION */ |