From 9e3932e99018bbb3ae0ae716bd7d9f53fcebf698 Mon Sep 17 00:00:00 2001 From: Charlie Turner Date: Sun, 24 Mar 2024 20:33:35 +0000 Subject: [PATCH] {vulkan,radv,anv}/video: fix issue in H264 scaling lists derivation Originally was trying to copy a pps's scaling list when an sps's was signaled. Fixes: 8daa32963 ("vulkan/video: add helper to derive H264 scaling lists") Signed-off-by: Charlie Turner Reviewed-by: Hyunjun Ko Part-of: --- src/vulkan/runtime/vk_video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vulkan/runtime/vk_video.c b/src/vulkan/runtime/vk_video.c index 9519b0ed943..ff6f7662d9d 100644 --- a/src/vulkan/runtime/vk_video.c +++ b/src/vulkan/runtime/vk_video.c @@ -736,7 +736,7 @@ vk_video_derive_h264_scaling_list(const StdVideoH264SequenceParameterSet *sps, { if (sps->pScalingLists->scaling_list_present_mask & (1 << i)) memcpy(temp.ScalingList4x4[i], - pps->pScalingLists->ScalingList4x4[i], + sps->pScalingLists->ScalingList4x4[i], STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS); else /* fall-back rule A */ { @@ -759,7 +759,7 @@ vk_video_derive_h264_scaling_list(const StdVideoH264SequenceParameterSet *sps, { int i = j + STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS; if (sps->pScalingLists->scaling_list_present_mask & (1 << i)) - memcpy(temp.ScalingList8x8[j], pps->pScalingLists->ScalingList8x8[j], + memcpy(temp.ScalingList8x8[j], sps->pScalingLists->ScalingList8x8[j], STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS); else /* fall-back rule A */ {