aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2024-10-23 20:00:39 -0300
committerJames Almer <jamrial@gmail.com>2024-10-23 20:06:03 -0300
commite46a506ae0ef4e803ee3c99c1258f66cf9bd1eac (patch)
treefba955d68ae5c47df42647daca472af24617ebdb
parentf1f54d2f826599f90090c1506ebca9977284bad2 (diff)
downloadffmpeg-e46a506ae0ef4e803ee3c99c1258f66cf9bd1eac.tar.gz
avcodec/vulkan_video: add proper maps for XV3{0,6}
Forgotten after fd8b0dcfed61ddf36b9523aa4ba1badc493b7707. Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavcodec/vulkan_video.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c
index 3a04d60d68..a97d224d55 100644
--- a/libavcodec/vulkan_video.c
+++ b/libavcodec/vulkan_video.c
@@ -33,7 +33,6 @@ static const struct FFVkFormatMapEntry {
{ VK_FORMAT_R32_SFLOAT, AV_PIX_FMT_GRAYF32, VK_IMAGE_ASPECT_COLOR_BIT },
/* RGB formats */
- { VK_FORMAT_R16G16B16A16_UNORM, AV_PIX_FMT_XV36, VK_IMAGE_ASPECT_COLOR_BIT },
{ VK_FORMAT_B8G8R8A8_UNORM, AV_PIX_FMT_BGRA, VK_IMAGE_ASPECT_COLOR_BIT },
{ VK_FORMAT_R8G8B8A8_UNORM, AV_PIX_FMT_RGBA, VK_IMAGE_ASPECT_COLOR_BIT },
{ VK_FORMAT_R8G8B8_UNORM, AV_PIX_FMT_RGB24, VK_IMAGE_ASPECT_COLOR_BIT },
@@ -89,6 +88,10 @@ static const struct FFVkFormatMapEntry {
{ VK_FORMAT_B8G8R8G8_422_UNORM, AV_PIX_FMT_UYVY422, VK_IMAGE_ASPECT_COLOR_BIT },
{ VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16, AV_PIX_FMT_Y210, VK_IMAGE_ASPECT_COLOR_BIT },
{ VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16, AV_PIX_FMT_Y212, VK_IMAGE_ASPECT_COLOR_BIT },
+
+ /* Single plane 444 at 10 and 12 bits */
+ { VK_FORMAT_A2R10G10B10_UNORM_PACK32, AV_PIX_FMT_XV30, VK_IMAGE_ASPECT_COLOR_BIT },
+ { VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16, AV_PIX_FMT_XV36, VK_IMAGE_ASPECT_COLOR_BIT },
};
static const int nb_vk_format_map = FF_ARRAY_ELEMS(vk_format_map);