avcodec/vulkan_video: add proper maps for XV3{0,6}

Forgotten after fd8b0dcfed61ddf36b9523aa4ba1badc493b7707.

James Almer committed 2 years ago

Commit e46a5061 parent f1f54d21 file · +4 −1Browse files

Showing the changes to libavcodec (1 of 1 file). Show all

Unified · Split

libavcodec/vulkan_video.c+4−1

@@ -33,7 +33,6 @@ static const struct FFVkFormatMapEntry { · 32 unmodified lines
33	33	{ VK_FORMAT_R32_SFLOAT, AV_PIX_FMT_GRAYF32, VK_IMAGE_ASPECT_COLOR_BIT },
34	34
35	35	/* RGB formats */
36		− { VK_FORMAT_R16G16B16A16_UNORM, AV_PIX_FMT_XV36, VK_IMAGE_ASPECT_COLOR_BIT },
37	36	{ VK_FORMAT_B8G8R8A8_UNORM, AV_PIX_FMT_BGRA, VK_IMAGE_ASPECT_COLOR_BIT },
38	37	{ VK_FORMAT_R8G8B8A8_UNORM, AV_PIX_FMT_RGBA, VK_IMAGE_ASPECT_COLOR_BIT },
39	38	{ VK_FORMAT_R8G8B8_UNORM, AV_PIX_FMT_RGB24, VK_IMAGE_ASPECT_COLOR_BIT },
@@ -89,6 +88,10 @@ static const struct FFVkFormatMapEntry { · 49 unmodified lines
89	88	{ VK_FORMAT_B8G8R8G8_422_UNORM, AV_PIX_FMT_UYVY422, VK_IMAGE_ASPECT_COLOR_BIT },
90	89	{ VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16, AV_PIX_FMT_Y210, VK_IMAGE_ASPECT_COLOR_BIT },
91	90	{ VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16, AV_PIX_FMT_Y212, VK_IMAGE_ASPECT_COLOR_BIT },
	91	+
	92	+ /* Single plane 444 at 10 and 12 bits */
	93	+ { VK_FORMAT_A2R10G10B10_UNORM_PACK32, AV_PIX_FMT_XV30, VK_IMAGE_ASPECT_COLOR_BIT },
	94	+ { VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16, AV_PIX_FMT_XV36, VK_IMAGE_ASPECT_COLOR_BIT },
92	95	};
93	96	static const int nb_vk_format_map = FF_ARRAY_ELEMS(vk_format_map);
94	97