The Vulkan spec wants ScalingList8x8 as defined by ITU spec, which is in a different order from how ffmpeg parses it.
Unified · Split
| @@ -43,6 +43,8 @@ typedef struct H264VulkanDecodePicture { · 42 unmodified lines | ||
| 43 | 43 | VkVideoDecodeH264PictureInfoKHR h264_pic_info; |
| 44 | 44 | } H264VulkanDecodePicture; |
| 45 | 45 | |
| 46 | +const static int h264_scaling_list8_order[] = { 0, 3, 1, 4, 2, 5 }; | |
| 47 | + | |
| 46 | 48 | static int vk_h264_fill_pict(AVCodecContext *avctx, H264Picture **ref_src, |
| 47 | 49 | VkVideoReferenceSlotInfoKHR *ref_slot, /* Main structure */ |
| 48 | 50 | VkVideoPictureResourceInfoKHR *ref, /* Goes in ^ */ |
| @@ -147,7 +149,7 @@ static void set_sps(const SPS *sps, · 98 unmodified lines | ||
| 147 | 149 | STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS * sizeof(**sps->scaling_matrix4)); |
| 148 | 150 | |
| 149 | 151 | for (int i = 0; i < STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS; i++) |
| 150 | − memcpy(vksps_scaling->ScalingList8x8[i], sps->scaling_matrix8[i], | |
| 152 | + memcpy(vksps_scaling->ScalingList8x8[i], sps->scaling_matrix8[h264_scaling_list8_order[i]], | |
| 151 | 153 | STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**sps->scaling_matrix8)); |
| 152 | 154 | |
| 153 | 155 | *vksps_vui_header = (StdVideoH264HrdParameters) { |
| @@ -252,7 +254,7 @@ static void set_pps(const PPS *pps, const SPS *sps, · 98 unmodified lines | ||
| 252 | 254 | STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS * sizeof(**pps->scaling_matrix4)); |
| 253 | 255 | |
| 254 | 256 | for (int i = 0; i < STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS; i++) |
| 255 | − memcpy(vkpps_scaling->ScalingList8x8[i], pps->scaling_matrix8[i], | |
| 257 | + memcpy(vkpps_scaling->ScalingList8x8[i], pps->scaling_matrix8[h264_scaling_list8_order[i]], | |
| 256 | 258 | STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**pps->scaling_matrix8)); |
| 257 | 259 | |
| 258 | 260 | *vkpps = (StdVideoH264PictureParameterSet) { |