diff options
| author | David Rosca <nowrep@gmail.com> | 2024-04-16 19:31:29 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2024-04-30 19:18:21 +0200 |
| commit | 9f0f6df18cfe74ece89820bda318892ca0f055c3 (patch) | |
| tree | 8e1f2f79c6fe2e25875ee08c6faad07c0fb204b2 | |
| parent | db932b64563ee54b19d016cd84b74c15477dfd3a (diff) | |
radeonsi/vcn: Fix 10bit HEVC VPS general_profile_compatibility_flags
Cc: mesa-stable
Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28945>
(cherry picked from commit b144f501906dcb4a54e0aa8d699768c8d9d13bbb)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 4289fe2a486..47dd0996dc4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -374,7 +374,7 @@ "description": "radeonsi/vcn: Fix 10bit HEVC VPS general_profile_compatibility_flags", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c index 0e32e8871f4..402681391df 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c @@ -779,7 +779,12 @@ static void radeon_enc_nalu_vps(struct radeon_encoder *enc) radeon_enc_code_fixed_bits(enc, 0x0, 2); radeon_enc_code_fixed_bits(enc, enc->enc_pic.general_tier_flag, 1); radeon_enc_code_fixed_bits(enc, enc->enc_pic.general_profile_idc, 5); - radeon_enc_code_fixed_bits(enc, 0x60000000, 32); + + if (enc->enc_pic.general_profile_idc == 2) + radeon_enc_code_fixed_bits(enc, 0x20000000, 32); + else + radeon_enc_code_fixed_bits(enc, 0x60000000, 32); + radeon_enc_code_fixed_bits(enc, 0xb0000000, 32); radeon_enc_code_fixed_bits(enc, 0x0, 16); radeon_enc_code_fixed_bits(enc, enc->enc_pic.general_level_idc, 8); |