OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv/video: fix hevc scaling list order.

Browse Source 
pps takes priority.

Fixes: da54b57888 ("radv/video: fix hevc scaling lists.")
Reviewed-by: Lynne <dev@lynne.ee>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23537>
This commit is contained in:
Dave Airlie
2023-06-09 12:55:11 +10:00
committed by Marge Bot
parent 4cc86e4ea9
commit 085f6ec6eb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/amd/vulkan/radv_video.c
View File

@@ -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) {