From 085f6ec6ebc8b6a6bfdfba8e2d7ec43ab9cbf7bf Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 9 Jun 2023 12:55:11 +1000 Subject: [PATCH] radv/video: fix hevc scaling list order. pps takes priority. Fixes: da54b57888cf ("radv/video: fix hevc scaling lists.") Reviewed-by: Lynne Part-of: --- src/amd/vulkan/radv_video.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_video.c b/src/amd/vulkan/radv_video.c index 7a5cbb1..032fd7c 100644 --- a/src/amd/vulkan/radv_video.c +++ b/src/amd/vulkan/radv_video.c @@ -1052,10 +1052,10 @@ static rvcn_dec_message_hevc_t get_h265_msg(struct radv_device *device, const StdVideoH265ScalingLists *scaling_lists = NULL; - if (sps->flags.sps_scaling_list_data_present_flag) - scaling_lists = sps->pScalingLists; - else if (pps->flags.pps_scaling_list_data_present_flag) + if (pps->flags.pps_scaling_list_data_present_flag) scaling_lists = pps->pScalingLists; + else if (sps->flags.sps_scaling_list_data_present_flag) + scaling_lists = sps->pScalingLists; update_h265_scaling(it_ptr, scaling_lists); @@ -1509,10 +1509,10 @@ static struct ruvd_h265 get_uvd_h265_msg(struct radv_device *device, result.ref_pic_set_lt_curr[i] = IDXS(h265_pic_info->pStdPictureInfo->RefPicSetLtCurr[i]); const StdVideoH265ScalingLists *scaling_lists = NULL; - if (sps->flags.sps_scaling_list_data_present_flag) - scaling_lists = sps->pScalingLists; - else if (pps->flags.pps_scaling_list_data_present_flag) + if (pps->flags.pps_scaling_list_data_present_flag) scaling_lists = pps->pScalingLists; + else if (sps->flags.sps_scaling_list_data_present_flag) + scaling_lists = sps->pScalingLists; update_h265_scaling(it_ptr, scaling_lists); if (scaling_lists) { -- 2.7.4