diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 00:49:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 00:49:48 +0000 |
| commit | 98188d9a9bc5803f1f78e2823f3d195c47a75266 (patch) | |
| tree | 763332b6febdd59dc045cdb2496a8d9249217d52 | |
| parent | 8050014f962903c44ca617fcfb99a9f367738ad9 (diff) | |
| parent | b5bd9f414299b491b5d7d24aa23f19fdc191dfc0 (diff) | |
| download | device_generic_goldfish-opengl-98188d9a9bc5803f1f78e2823f3d195c47a75266.tar.gz device_generic_goldfish-opengl-98188d9a9bc5803f1f78e2823f3d195c47a75266.tar.bz2 device_generic_goldfish-opengl-98188d9a9bc5803f1f78e2823f3d195c47a75266.zip | |
Merge changes I4665c1fb,I3d9b8dd9 am: b5bd9f4142
Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/1419710
Change-Id: I59b39abea365e8c79e3f50cc079b315a31e45986
| -rw-r--r-- | system/OpenglSystemCommon/FormatConversions.cpp | 3 | ||||
| -rw-r--r-- | system/vulkan_enc/vk_format_info.h | 16 |
2 files changed, 16 insertions, 3 deletions
diff --git a/system/OpenglSystemCommon/FormatConversions.cpp b/system/OpenglSystemCommon/FormatConversions.cpp index cc976ed0..aae6bb98 100644 --- a/system/OpenglSystemCommon/FormatConversions.cpp +++ b/system/OpenglSystemCommon/FormatConversions.cpp @@ -35,11 +35,14 @@ static int get_rgb_offset(int row, int width, int rgbStride) { return row * width * rgbStride; } +#define OMX_COLOR_FormatYUV420Planar 0x13 + bool gralloc_is_yuv_format(const int format) { switch (format) { case HAL_PIXEL_FORMAT_YV12: case HAL_PIXEL_FORMAT_YCbCr_420_888: case HAL_PIXEL_FORMAT_YCrCb_420_SP: + case OMX_COLOR_FormatYUV420Planar: return true; default: diff --git a/system/vulkan_enc/vk_format_info.h b/system/vulkan_enc/vk_format_info.h index dd9c99bc..80f69d91 100644 --- a/system/vulkan_enc/vk_format_info.h +++ b/system/vulkan_enc/vk_format_info.h @@ -36,6 +36,11 @@ /* See i915_private_android_types.h in minigbm. */ #define HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL 0x100 +// TODO(b/167698976): We should not use OMX_COLOR_FormatYUV420Planar +// but we seem to miss a format translation somewhere. + +#define OMX_COLOR_FormatYUV420Planar 0x13 + static inline VkFormat vk_format_from_android(unsigned android_format) { @@ -54,11 +59,12 @@ vk_format_from_android(unsigned android_format) return VK_FORMAT_A2B10G10R10_UNORM_PACK32; case HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL: return VK_FORMAT_G8_B8R8_2PLANE_420_UNORM; + case AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: + return VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM; #ifdef VK_USE_PLATFORM_ANDROID_KHR case HAL_PIXEL_FORMAT_YV12: - // YUV converter will convert this format to R8G8B8A8 - // TODO: should we use R8G8B8A8 for other YUV format as well? - return VK_FORMAT_R8G8B8A8_UNORM; + case OMX_COLOR_FormatYUV420Planar: + return VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM; case AHARDWAREBUFFER_FORMAT_BLOB: #endif default: @@ -82,6 +88,8 @@ android_format_from_vk(VkFormat vk_format) return AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM; case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM: return HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL; + case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM: + return HAL_PIXEL_FORMAT_YV12; default: return AHARDWAREBUFFER_FORMAT_BLOB; } @@ -92,6 +100,8 @@ android_format_is_yuv(unsigned android_format) { switch (android_format) { case HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL: + case OMX_COLOR_FormatYUV420Planar: + case HAL_PIXEL_FORMAT_YV12: return true; default: |