Module: Mesa Branch: main Commit: 0e4b1b8f2305c34f7989f7a7ffb8be149d0184bd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e4b1b8f2305c34f7989f7a7ffb8be149d0184bd
Author: Benjamin Cheng <[email protected]> Date: Mon Jul 31 18:46:22 2023 -0400 radv/video: copy from correct H264 scaling lists Vulkan defines the scaling lists according to the H264 ITU spec, which only defines ScalingList8x8[0] and ScalingList8x8[1] for non-444 formats. Since RADV only supports 420, just directly use those. Reviewed-by: Lynne <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24413> --- src/amd/vulkan/radv_video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_video.c b/src/amd/vulkan/radv_video.c index f4b36c5fb27..1ab0465a9b9 100644 --- a/src/amd/vulkan/radv_video.c +++ b/src/amd/vulkan/radv_video.c @@ -823,11 +823,11 @@ get_h264_msg(struct radv_video_session *vid, struct radv_video_session_params *p if (pps->flags.pic_scaling_matrix_present_flag) { memcpy(result.scaling_list_4x4, pps->pScalingLists->ScalingList4x4, 6 * 16); memcpy(result.scaling_list_8x8[0], pps->pScalingLists->ScalingList8x8[0], 64); - memcpy(result.scaling_list_8x8[1], pps->pScalingLists->ScalingList8x8[3], 64); + memcpy(result.scaling_list_8x8[1], pps->pScalingLists->ScalingList8x8[1], 64); } else if (sps->flags.seq_scaling_matrix_present_flag) { memcpy(result.scaling_list_4x4, sps->pScalingLists->ScalingList4x4, 6 * 16); memcpy(result.scaling_list_8x8[0], sps->pScalingLists->ScalingList8x8[0], 64); - memcpy(result.scaling_list_8x8[1], sps->pScalingLists->ScalingList8x8[3], 64); + memcpy(result.scaling_list_8x8[1], sps->pScalingLists->ScalingList8x8[1], 64); } else { memset(result.scaling_list_4x4, 0x10, 6 * 16); memset(result.scaling_list_8x8, 0x10, 2 * 64);
