encoder: add 10/12-bit packed YCbCr format support

- Add R10X6 and R12X4 single-channel packed formats to image view creation
- Extend vkFormatInfo table with 10/12-bit packed formats:
  R10X6/R12X4 (1-ch), R10X6G10X6/R12X4G12X4 (2-ch), and 4-channel variants
- Replace local getFormatTexelSize() with vkFormatLookUp() for texel size
- Add VulkanAqProcessor.h include guarded with NV_AQ_GPU_LIB_SUPPORTED

Signed-off-by: Tony Zlatinski <[email protected]>

Author: zlatinski

common/libs/VkCodecUtils/VkImageResource.cpp

@@ -249,6 +249,8 @@ VkResult VkImageResourceView::Create(const VulkanDeviceContext* vkDevCtx,
             switch(viewInfo.format) {
             case VK_FORMAT_R8_UNORM:
             case VK_FORMAT_R16_UNORM:
+            case VK_FORMAT_R10X6_UNORM_PACK16:
+            case VK_FORMAT_R12X4_UNORM_PACK16:
             case VK_FORMAT_R8G8_UNORM:
             case VK_FORMAT_R16G16_UNORM:
             case VK_FORMAT_R32_UINT:

common/libs/VkCodecUtils/nvVkFormats.cpp

@@ -32,9 +32,15 @@ const VkFormatDesc vkFormatInfo[] = {
     { VK_FORMAT_R32_SFLOAT,                     1,   4,        "r32f",              },
     { VK_FORMAT_R16_SFLOAT,                     1,   2,        "r16f",              },
     { VK_FORMAT_R16G16B16A16_UNORM,             4,   8,        "rgba16",            },
+    { VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16,4,8,        "rgba16",            },
+    { VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16,4,8,        "rgba16",            },
     { VK_FORMAT_A2B10G10R10_UNORM_PACK32,       4,   4,        "rgb10_a2",          },
     { VK_FORMAT_R16G16_UNORM,                   2,   4,        "rg16",              },
+    { VK_FORMAT_R10X6G10X6_UNORM_2PACK16,       2,   4,        "rg16",              },
+    { VK_FORMAT_R12X4G12X4_UNORM_2PACK16,       2,   4,        "rg16",              },
     { VK_FORMAT_R16_UNORM,                      1,   2,        "r16",               },
+    { VK_FORMAT_R10X6_UNORM_PACK16,             1,   2,        "r16",               },
+    { VK_FORMAT_R12X4_UNORM_PACK16,             1,   2,        "r16",               },
     { VK_FORMAT_R16G16B16A16_SNORM,             4,   8,        "rgba16_snorm",      },
     { VK_FORMAT_R8G8B8A8_SNORM,                 4,   4,        "rgba8_snorm",       },
     { VK_FORMAT_R16G16_SNORM,                   2,   4,        "rg16_snorm",        },

vk_video_encoder/libs/VkVideoEncoder/VkVideoEncoder.cpp

@@ -24,25 +24,9 @@
 #include "VkVideoEncoder/VkEncoderConfigH265.h"
 #include "VkVideoEncoder/VkEncoderConfigAV1.h"
 #include "VkCodecUtils/YCbCrConvUtilsCpu.h"
-
-static size_t getFormatTexelSize(VkFormat format)
-{
-    switch (format) {
-    case VK_FORMAT_R8_UINT:
-    case VK_FORMAT_R8_SINT:
-    case VK_FORMAT_R8_UNORM:
-        return 1;
-    case VK_FORMAT_R16_UINT:
-    case VK_FORMAT_R16_SINT:
-        return 2;
-    case VK_FORMAT_R32_UINT:
-    case VK_FORMAT_R32_SINT:
-        return 4;
-    default:
-        assert(!"unknown format");
-        return 0;
-    }
-}
+#ifdef NV_AQ_GPU_LIB_SUPPORTED
+#include "VulkanAqProcessor.h"
+#endif // NV_AQ_GPU_LIB_SUPPORTED
 
 VkResult VkVideoEncoder::CreateVideoEncoder(const VulkanDeviceContext* vkDevCtx,
                                             VkSharedBaseObj<EncoderConfig>& encoderConfig,
@@ -101,18 +85,19 @@ VkResult VkVideoEncoder::LoadNextQpMapFrameFromFile(VkSharedBaseObj<VkVideoEncod
         uint8_t* writeQpMapImagePtr = srcQpMapImageDeviceMemory->GetDataPtr(qpMapImageOffset, qpMapMaxSize);
         assert(writeQpMapImagePtr != nullptr);
 
-        size_t formatSize = getFormatTexelSize(m_imageQpMapFormat);
+        const VkFormatDesc* pFormatDesc = vkFormatLookUp(m_imageQpMapFormat);
+        size_t formatTexelSize = (pFormatDesc != nullptr) ? pFormatDesc->numberOfBytes : 1;
         uint32_t inputQpMapWidth = (m_encoderConfig->input.width + m_qpMapTexelSize.width - 1) / m_qpMapTexelSize.width;
         uint32_t qpMapWidth = (m_encoderConfig->encodeWidth + m_qpMapTexelSize.width - 1) / m_qpMapTexelSize.width;
         uint32_t qpMapHeight = (m_encoderConfig->encodeHeight + m_qpMapTexelSize.height - 1) / m_qpMapTexelSize.height;
-        uint64_t qpMapFileOffset = qpMapWidth * qpMapHeight * encodeFrameInfo->frameInputOrderNum * formatSize;
+        uint64_t qpMapFileOffset = qpMapWidth * qpMapHeight * encodeFrameInfo->frameInputOrderNum * formatTexelSize;
         const uint8_t* pQpMapData = m_encoderConfig->qpMapFileHandler.GetMappedPtr(qpMapFileOffset);
 
         const VkSubresourceLayout* dstQpMapSubresourceLayout = dstQpMapImageResource->GetSubresourceLayout();
 
         for (uint32_t j = 0; j < qpMapHeight; j++) {
             memcpy(writeQpMapImagePtr + (dstQpMapSubresourceLayout[0].offset + j * dstQpMapSubresourceLayout[0].rowPitch),
-                   pQpMapData + j * inputQpMapWidth * formatSize, qpMapWidth * formatSize);
+                   pQpMapData + j * inputQpMapWidth * formatTexelSize, qpMapWidth * formatTexelSize);
         }
     }