From c0709706ddda0d1f079d4020047bcdeb0bc4a7f1 Mon Sep 17 00:00:00 2001 From: Benjamin Cheng Date: Tue, 1 Aug 2023 10:20:34 -0400 Subject: [PATCH] vulkan_h264: fill correct ScalingList8x8 entries The Vulkan spec wants ScalingList8x8 as defined by ITU spec, which is in a different order from how ffmpeg parses it. --- libavcodec/vulkan_h264.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/vulkan_h264.c b/libavcodec/vulkan_h264.c index f08a107a36..f38bb9057b 100644 --- a/libavcodec/vulkan_h264.c +++ b/libavcodec/vulkan_h264.c @@ -43,6 +43,8 @@ typedef struct H264VulkanDecodePicture { VkVideoDecodeH264PictureInfoKHR h264_pic_info; } H264VulkanDecodePicture; +const static int h264_scaling_list8_order[] = { 0, 3, 1, 4, 2, 5 }; + static int vk_h264_fill_pict(AVCodecContext *avctx, H264Picture **ref_src, VkVideoReferenceSlotInfoKHR *ref_slot, /* Main structure */ VkVideoPictureResourceInfoKHR *ref, /* Goes in ^ */ @@ -147,7 +149,7 @@ static void set_sps(const SPS *sps, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS * sizeof(**sps->scaling_matrix4)); for (int i = 0; i < STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS; i++) - memcpy(vksps_scaling->ScalingList8x8[i], sps->scaling_matrix8[i], + memcpy(vksps_scaling->ScalingList8x8[i], sps->scaling_matrix8[h264_scaling_list8_order[i]], STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**sps->scaling_matrix8)); *vksps_vui_header = (StdVideoH264HrdParameters) { @@ -252,7 +254,7 @@ static void set_pps(const PPS *pps, const SPS *sps, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS * sizeof(**pps->scaling_matrix4)); for (int i = 0; i < STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS; i++) - memcpy(vkpps_scaling->ScalingList8x8[i], pps->scaling_matrix8[i], + memcpy(vkpps_scaling->ScalingList8x8[i], pps->scaling_matrix8[h264_scaling_list8_order[i]], STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**pps->scaling_matrix8)); *vkpps = (StdVideoH264PictureParameterSet) {