From dd6fca1d02b0ffd913b8c139ff403d958387a40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Mon, 23 Oct 2023 17:10:54 +0200 Subject: [PATCH] vulkan video: add GST_VK_VIDEO_EXTENSIONS enum To avoid using mysterious value, use an enum to show the valid value in _vk_codec_extensions Part-of: --- .../gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder.c | 4 ++-- .../gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.c | 4 ++-- .../gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.h | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder.c index 3c314b6002..08821e8406 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkdecoder.c @@ -193,7 +193,7 @@ gst_vulkan_decoder_start (GstVulkanDecoder * self, .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_KHR, }; /* *INDENT-ON* */ - codec_idx = 0; + codec_idx = GST_VK_VIDEO_EXTENSION_DECODE_H264; break; case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR: /* *INDENT-OFF* */ @@ -201,7 +201,7 @@ gst_vulkan_decoder_start (GstVulkanDecoder * self, .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR, }; /* *INDENT-ON* */ - codec_idx = 1; + codec_idx = GST_VK_VIDEO_EXTENSION_DECODE_H265; break; default: g_assert_not_reached (); diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.c index 065866ff59..dade136d1e 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.c @@ -29,11 +29,11 @@ /* *INDENT-OFF* */ const VkExtensionProperties _vk_codec_extensions[] = { - { + [GST_VK_VIDEO_EXTENSION_DECODE_H264] { .extensionName = VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_EXTENSION_NAME, .specVersion = VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_SPEC_VERSION, }, - { + [GST_VK_VIDEO_EXTENSION_DECODE_H265] { .extensionName = VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_EXTENSION_NAME, .specVersion = VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_SPEC_VERSION, }, diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.h b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.h index b774b866eb..3c90adf52c 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.h +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.h @@ -40,6 +40,11 @@ struct _GstVulkanVideoSession GstBuffer *buffer; }; +typedef enum { + GST_VK_VIDEO_EXTENSION_DECODE_H264, + GST_VK_VIDEO_EXTENSION_DECODE_H265, +} GST_VK_VIDEO_EXTENSIONS; + #define GST_VULKAN_VIDEO_FN_LIST(V) \ V(GetPhysicalDeviceVideoFormatProperties) \ V(GetPhysicalDeviceVideoCapabilities) \