From 94bc232abedd4ce19d8731b5beaa53d55777469a Mon Sep 17 00:00:00 2001 From: Thong Thai Date: Tue, 22 Jun 2021 13:47:52 -0400 Subject: [PATCH] radeon/vcn/enc: Add missing line to HEVC SPS header code Add previously missing line in HEVC SPS header generation on VCN 1.0 devices, for when an image does not need to be cropped. Fixes: e62c7e7c6ca ("radeon: Add cropping to encoded H.265 when padding is used") Signed-off-by: Thong Thai Reviewed-by: Leo Liu Part-of: (cherry picked from commit d977e7fbe107898480506fdd7bca9b177718587a) --- .pick_status.json | 2 +- src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index d9c62b55ebf..4dce3a6c461 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1615,7 +1615,7 @@ "description": "radeon/vcn/enc: Add missing line to HEVC SPS header code", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e62c7e7c6caa6c9531afb694e7952a7fc3ac4401" }, diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c b/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c index 8302e3ffb3b..baa3af409ba 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c +++ b/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c @@ -412,6 +412,7 @@ static void radeon_enc_nalu_sps_hevc(struct radeon_encoder *enc) radeon_enc_code_ue(enc, enc->enc_pic.session_init.padding_height / 2); radeon_enc_code_ue(enc, enc->enc_pic.session_init.padding_height / 2); } else + radeon_enc_code_fixed_bits(enc, 0x0, 1); radeon_enc_code_ue(enc, enc->enc_pic.bit_depth_luma_minus8); radeon_enc_code_ue(enc, enc->enc_pic.bit_depth_chroma_minus8);