From 842ab249238d0200dc1c394a634865dbe9070f21 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Thu, 12 Mar 2026 12:06:04 +0100 Subject: [PATCH] radv/video: Fix coding pic_parameter_set_id in H264 slice header Cc: mesa-stable Reviewed-by: Ruijing Dong (cherry picked from commit 25095cc3931dcf55c6635c0930184293dba9dd89) Part-of: --- .pick_status.json | 2 +- src/amd/vulkan/radv_video_enc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index aeaa75cb177..3a66019d8b4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -314,7 +314,7 @@ "description": "radv/video: Fix coding pic_parameter_set_id in H264 slice header", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_video_enc.c b/src/amd/vulkan/radv_video_enc.c index 1acb5ea40a7..eae8b69dc16 100644 --- a/src/amd/vulkan/radv_video_enc.c +++ b/src/amd/vulkan/radv_video_enc.c @@ -1095,7 +1095,7 @@ radv_enc_slice_header(struct radv_cmd_buffer *cmd_buffer, const VkVideoEncodeInf radv_enc_code_ue(cmd_buffer, 6); break; } - radv_enc_code_ue(cmd_buffer, 0x0); + radv_enc_code_ue(cmd_buffer, pic->pic_parameter_set_id); unsigned int max_frame_num_bits = sps->log2_max_frame_num_minus4 + 4; radv_enc_code_fixed_bits(cmd_buffer, pic->frame_num % (1 << max_frame_num_bits), max_frame_num_bits);