Module: Mesa Branch: staging/20.3 Commit: 7c74888039a7407c47d383d342d39b0466cb4654 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c74888039a7407c47d383d342d39b0466cb4654
Author: Ruijing Dong <[email protected]> Date: Thu Dec 3 15:34:56 2020 -0500 radeon/vcn: fix hevc 10bit profile error hevc main10 profile error fix CC: mesa-stable Signed-off-by: Ruijing Dong <[email protected]> Reviewed-by: Leo Liu <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8038> (cherry picked from commit 69487c754c48f31f1e2befa7aea0c2e78e77b0df) --- .pick_status.json | 2 +- src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1b69f817fdb..2ce18f59d2e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -256,7 +256,7 @@ "description": "radeon/vcn: fix hevc 10bit profile error", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c b/src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c index 56c6bf9a478..7ab8efcd9f7 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c +++ b/src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c @@ -120,7 +120,12 @@ static void radeon_enc_nalu_sps_hevc(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); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
