History

avutil/hwcontext_vulkan: add missing packed YUV444 format mappings

James Almer committed 2 years ago

Commit bb57b781 parent 839f6d32 files · +9 −2Browse files

Unified · Split

2 files
  1. libavutil/hwcontext_vulkan.c +6 −1
  2. libavutil/vulkan.c +3 −1
libavutil/hwcontext_vulkan.c+6−1
@@ -363,14 +363,18 @@ static const struct FFVkFormatEntry { · 362 unmodified lines
363 { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P12, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },363 { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P12, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
364 { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P16, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },364 { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P16, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
365 365
366 /* Single plane 422 at 8, 10 and 12 bits */366 /* Single plane 422 at 8, 10, 12 and 16 bits */
367 { VK_FORMAT_G8B8G8R8_422_UNORM, AV_PIX_FMT_YUYV422, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R8G8B8A8_UNORM } },367 { VK_FORMAT_G8B8G8R8_422_UNORM, AV_PIX_FMT_YUYV422, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R8G8B8A8_UNORM } },
368 { VK_FORMAT_B8G8R8G8_422_UNORM, AV_PIX_FMT_UYVY422, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R8G8B8A8_UNORM } },368 { VK_FORMAT_B8G8R8G8_422_UNORM, AV_PIX_FMT_UYVY422, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R8G8B8A8_UNORM } },
369 { VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16, AV_PIX_FMT_Y210, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } },369 { VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16, AV_PIX_FMT_Y210, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } },
370 { VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16, AV_PIX_FMT_Y212, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } },370 { VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16, AV_PIX_FMT_Y212, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } },
371 { VK_FORMAT_G16B16G16R16_422_UNORM, AV_PIX_FMT_Y216, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } },371 { VK_FORMAT_G16B16G16R16_422_UNORM, AV_PIX_FMT_Y216, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } },
372
373 /* Single plane 444 at 8, 10, 12 and 16 bits */
374 { VK_FORMAT_B8G8R8A8_UNORM, AV_PIX_FMT_UYVA, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_B8G8R8A8_UNORM } },
372 { VK_FORMAT_A2R10G10B10_UNORM_PACK32, AV_PIX_FMT_XV30, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } },375 { VK_FORMAT_A2R10G10B10_UNORM_PACK32, AV_PIX_FMT_XV30, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } },
373 { VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16, AV_PIX_FMT_XV36, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } },376 { VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16, AV_PIX_FMT_XV36, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } },
377 { VK_FORMAT_R16G16B16A16_UNORM, AV_PIX_FMT_XV48, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } },
374};378};
375static const int nb_vk_formats_list = FF_ARRAY_ELEMS(vk_formats_list);379static const int nb_vk_formats_list = FF_ARRAY_ELEMS(vk_formats_list);
376 380
@@ -2869,6 +2873,7 @@ static const struct { · 2492 unmodified lines
2869 { DRM_FORMAT_XYUV8888, VK_FORMAT_R8G8B8A8_UNORM },2873 { DRM_FORMAT_XYUV8888, VK_FORMAT_R8G8B8A8_UNORM },
2870 { DRM_FORMAT_XVYU2101010, VK_FORMAT_A2R10G10B10_UNORM_PACK32 } ,2874 { DRM_FORMAT_XVYU2101010, VK_FORMAT_A2R10G10B10_UNORM_PACK32 } ,
2871 { DRM_FORMAT_XVYU12_16161616, VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16 } ,2875 { DRM_FORMAT_XVYU12_16161616, VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16 } ,
2876 { DRM_FORMAT_XVYU16161616, VK_FORMAT_R16G16B16A16_UNORM } ,
2872#endif2877#endif
2873};2878};
2874 2879
libavutil/vulkan.c+3−1
@@ -1300,6 +1300,7 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pix_fmt, · 1299 unmodified lines
1300 case AV_PIX_FMT_RGB0:1300 case AV_PIX_FMT_RGB0:
1301 case AV_PIX_FMT_RGB565:1301 case AV_PIX_FMT_RGB565:
1302 case AV_PIX_FMT_BGR565:1302 case AV_PIX_FMT_BGR565:
1303 case AV_PIX_FMT_UYVA:
1303 case AV_PIX_FMT_YUYV422:1304 case AV_PIX_FMT_YUYV422:
1304 case AV_PIX_FMT_UYVY422: {1305 case AV_PIX_FMT_UYVY422: {
1305 const char *rep_tab[] = {1306 const char *rep_tab[] = {
@@ -1326,7 +1327,8 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pix_fmt, · 20 unmodified lines
1326 case AV_PIX_FMT_RGBA64:1327 case AV_PIX_FMT_RGBA64:
1327 case AV_PIX_FMT_Y212:1328 case AV_PIX_FMT_Y212:
1328 case AV_PIX_FMT_Y216:1329 case AV_PIX_FMT_Y216:
1329 case AV_PIX_FMT_XV36: {1330 case AV_PIX_FMT_XV36:
1331 case AV_PIX_FMT_XV48: {
1330 const char *rep_tab[] = {1332 const char *rep_tab[] = {
1331 [FF_VK_REP_NATIVE] = "rgba16ui",1333 [FF_VK_REP_NATIVE] = "rgba16ui",
1332 [FF_VK_REP_FLOAT] = "rgba16",1334 [FF_VK_REP_FLOAT] = "rgba16",

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t