diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideoutils.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideoutils.c index fff79bb436..2d11301a98 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideoutils.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideoutils.c @@ -117,17 +117,17 @@ gst_vulkan_video_profile_to_caps (const GstVulkanVideoProfile * profile) switch (profile->profile.videoCodecOperation) { case VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR: - if (profile->codec.h264.sType == video_codecs_map[i].stype) { + if (profile->codec.h264dec.sType == video_codecs_map[i].stype) { int j; for (j = 0; j < G_N_ELEMENTS (h264_profile_map); j++) { - if (profile->codec.h264.stdProfileIdc + if (profile->codec.h264dec.stdProfileIdc == h264_profile_map[j].vk_profile) { profile_str = h264_profile_map[j].profile_str; break; } } for (j = 0; j < G_N_ELEMENTS (h264_layout_map); j++) { - if (profile->codec.h264.pictureLayout + if (profile->codec.h264dec.pictureLayout == h264_layout_map[j].layout) { layout = h264_layout_map[j].layout_str; break; @@ -136,10 +136,10 @@ gst_vulkan_video_profile_to_caps (const GstVulkanVideoProfile * profile) } break; case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR: - if (profile->codec.h265.sType == video_codecs_map[i].stype) { + if (profile->codec.h265dec.sType == video_codecs_map[i].stype) { int j; for (j = 0; j < G_N_ELEMENTS (h265_profile_map); j++) { - if (profile->codec.h265.stdProfileIdc + if (profile->codec.h265dec.stdProfileIdc == h265_profile_map[j].vk_profile) profile_str = h265_profile_map[j].profile_str; } @@ -235,17 +235,17 @@ gst_vulkan_video_profile_from_caps (GstVulkanVideoProfile * profile, case VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR:{ int j; - profile->codec.h264.sType = video_codecs_map[i].stype; - profile->codec.h264.stdProfileIdc = + profile->codec.h264dec.sType = video_codecs_map[i].stype; + profile->codec.h264dec.stdProfileIdc = STD_VIDEO_H264_PROFILE_IDC_INVALID; - profile->codec.h264.pictureLayout = + profile->codec.h264dec.pictureLayout = VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_FLAG_BITS_MAX_ENUM_KHR; profile->usage.pNext = &profile->codec; profile_str = gst_structure_get_string (structure, "profile"); for (j = 0; profile_str && j < G_N_ELEMENTS (h264_profile_map); j++) { if (g_strcmp0 (profile_str, h264_profile_map[j].profile_str) == 0) { - profile->codec.h264.stdProfileIdc = + profile->codec.h264dec.stdProfileIdc = h264_profile_map[j].vk_profile; break; } @@ -253,7 +253,7 @@ gst_vulkan_video_profile_from_caps (GstVulkanVideoProfile * profile, layout = gst_structure_get_string (structure, "interlace-mode"); for (j = 0; layout && j < G_N_ELEMENTS (h264_layout_map); j++) { if (g_strcmp0 (layout, h264_layout_map[j].layout_str) == 0) { - profile->codec.h264.pictureLayout = h264_layout_map[j].layout; + profile->codec.h264dec.pictureLayout = h264_layout_map[j].layout; break; } } @@ -262,15 +262,15 @@ gst_vulkan_video_profile_from_caps (GstVulkanVideoProfile * profile, case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR:{ int j; - profile->codec.h265.sType = video_codecs_map[i].stype; - profile->codec.h265.stdProfileIdc = + profile->codec.h265dec.sType = video_codecs_map[i].stype; + profile->codec.h265dec.stdProfileIdc = STD_VIDEO_H265_PROFILE_IDC_INVALID; profile->usage.pNext = &profile->codec; profile_str = gst_structure_get_string (structure, "profile"); for (j = 0; profile_str && j < G_N_ELEMENTS (h265_profile_map); j++) { if (g_strcmp0 (profile_str, h265_profile_map[j].profile_str) == 0) { - profile->codec.h265.stdProfileIdc = + profile->codec.h265dec.stdProfileIdc = h265_profile_map[j].vk_profile; break; } diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideoutils.h b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideoutils.h index ae26d4327a..8e97fa2dd6 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideoutils.h +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideoutils.h @@ -40,8 +40,8 @@ struct _GstVulkanVideoProfile VkVideoDecodeUsageInfoKHR usage; union { VkBaseInStructure base; - VkVideoDecodeH264ProfileInfoKHR h264; - VkVideoDecodeH265ProfileInfoKHR h265; + VkVideoDecodeH264ProfileInfoKHR h264dec; + VkVideoDecodeH265ProfileInfoKHR h265dec; } codec; #endif gpointer _reserved[GST_PADDING]; diff --git a/subprojects/gst-plugins-bad/tests/check/libs/vkimagebufferpool.c b/subprojects/gst-plugins-bad/tests/check/libs/vkimagebufferpool.c index 6434242ad4..25a289f84d 100644 --- a/subprojects/gst-plugins-bad/tests/check/libs/vkimagebufferpool.c +++ b/subprojects/gst-plugins-bad/tests/check/libs/vkimagebufferpool.c @@ -134,7 +134,7 @@ GST_START_TEST (test_vulkan_profiles) .chromaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_10_BIT_KHR, .lumaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_10_BIT_KHR, }, - .codec.h265 = { + .codec.h265dec = { .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR, .stdProfileIdc = STD_VIDEO_H265_PROFILE_IDC_MAIN_10, } @@ -150,8 +150,8 @@ GST_START_TEST (test_vulkan_profiles) == VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR); fail_unless (profile2.profile.videoCodecOperation == profile.profile.videoCodecOperation); - fail_unless (profile2.codec.h265.stdProfileIdc - == profile.codec.h265.stdProfileIdc); + fail_unless (profile2.codec.h265dec.stdProfileIdc + == profile.codec.h265dec.stdProfileIdc); } GST_END_TEST; @@ -172,7 +172,7 @@ GST_START_TEST (test_decoding_image) .chromaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR, .lumaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR, }, - .codec.h264 = { + .codec.h264dec = { .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR, .stdProfileIdc = STD_VIDEO_H264_PROFILE_IDC_MAIN, .pictureLayout = VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_PROGRESSIVE_KHR,