encode: Fix h.264 compiler warnings

nvpro-samples · Feb 21, 2025 · da411b4 · da411b4
1 parent 8229fe8
commit da411b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/common/libs/VkCodecUtils/HelpersDispatchTable.cpp b/common/libs/VkCodecUtils/HelpersDispatchTable.cpp
@@ -98,6 +98,9 @@ void InitDispatchTableMiddle(VkInstance instance, bool include_bottom, VkInterfa
 #ifdef VK_USE_VIDEO_QUEUE
     pVkFunctions->GetPhysicalDeviceVideoCapabilitiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceVideoCapabilitiesKHR>(getInstanceProcAddrFunc(instance, "vkGetPhysicalDeviceVideoCapabilitiesKHR"));
 #endif
+#ifdef VK_USE_VIDEO_ENCODE_QUEUE
+    pVkFunctions->GetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR>(getInstanceProcAddrFunc(instance, "vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR"));
+#endif
 
     if (!include_bottom)
         return;

diff --git a/common/libs/VkCodecUtils/HelpersDispatchTable.h b/common/libs/VkCodecUtils/HelpersDispatchTable.h
@@ -298,6 +298,7 @@ struct VkInterfaceFunctions {
 // VK_KHR_video_encode_queue
     PFN_vkCmdEncodeVideoKHR CmdEncodeVideoKHR;
     PFN_vkGetEncodedVideoSessionParametersKHR GetEncodedVideoSessionParametersKHR;
+    PFN_vkGetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR GetPhysicalDeviceVideoEncodeQualityLevelPropertiesKHR;
 #endif
 
 // VK_KHR_synchronization2

diff --git a/vk_video_encoder/libs/VkVideoEncoder/VkEncoderConfigH264.h b/vk_video_encoder/libs/VkVideoEncoder/VkEncoderConfigH264.h
@@ -64,10 +64,10 @@ struct EncoderConfigH264 : public EncoderConfig {
         , h264EncodeCapabilities()
         , hrdBitrate(maxBitrate)
         , pic_width_in_mbs(DivUp<uint32_t>(encodeWidth, 16))
+        , pic_height_in_map_units(DivUp<uint32_t>(encodeHeight, 16))
         , numRefL0(0)
         , numRefL1(0)
         , numRefFrames(0)
-        , pic_height_in_map_units(DivUp<uint32_t>(encodeHeight, 16))
         , entropyCodingMode(ENTROPY_CODING_MODE_CABAC)
         , adaptiveTransformMode(ADAPTIVE_TRANSFORM_ENABLE)
         , spsId(0)