AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeon: Add cropping to encoded H.265 when padding is used

Browse Source 
Because the VCN encoder needs the surface to be memory aligned, the
resolution of the image passed to the encoder might be larger and have
extra padding added - this change crops the resulting output to
compensate for the extra padding that might have been added.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4559
Signed-off-by: Thong Thai <thong.thai@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10137>
This commit is contained in:
Thong Thai
2021-04-09 10:26:59 -04:00
committed by Marge Bot
parent 77fdabdfa5
commit e62c7e7c6c
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c
View File

@@ -397,15 +397,21 @@ static void radeon_enc_nalu_sps_hevc(struct radeon_encoder *enc)
radeon_enc_code_ue(enc, enc->enc_pic.session_init.aligned_picture_width);
radeon_enc_code_ue(enc, enc->enc_pic.session_init.aligned_picture_height);
if ((enc->enc_pic.crop_left != 0) || (enc->enc_pic.crop_right != 0) ||
(enc->enc_pic.crop_top != 0) || (enc->enc_pic.crop_bottom != 0)) {
radeon_enc_code_fixed_bits(enc, 0x1, 1);
radeon_enc_code_ue(enc, enc->enc_pic.crop_left);
radeon_enc_code_ue(enc, enc->enc_pic.crop_right);
radeon_enc_code_ue(enc, enc->enc_pic.crop_top);
radeon_enc_code_ue(enc, enc->enc_pic.crop_bottom);
} else
radeon_enc_code_fixed_bits(enc, 0x0, 1);
if ((enc->enc_pic.crop_left != 0) || (enc->enc_pic.crop_right != 0) ||
(enc->enc_pic.crop_top != 0) || (enc->enc_pic.crop_bottom != 0)) {
radeon_enc_code_fixed_bits(enc, 0x1, 1);
radeon_enc_code_ue(enc, enc->enc_pic.crop_left);
radeon_enc_code_ue(enc, enc->enc_pic.crop_right);
radeon_enc_code_ue(enc, enc->enc_pic.crop_top);
radeon_enc_code_ue(enc, enc->enc_pic.crop_bottom);
} else if (enc->enc_pic.session_init.padding_width != 0 ||
enc->enc_pic.session_init.padding_height != 0) {
radeon_enc_code_fixed_bits(enc, 0x1, 1);
radeon_enc_code_ue(enc, enc->enc_pic.session_init.padding_width / 2);
radeon_enc_code_ue(enc, enc->enc_pic.session_init.padding_width / 2);
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_ue(enc, enc->enc_pic.bit_depth_luma_minus8);
radeon_enc_code_ue(enc, enc->enc_pic.bit_depth_chroma_minus8);

25
src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c
View File

@@ -284,15 +284,22 @@ static void radeon_enc_nalu_sps_hevc(struct radeon_encoder *enc)
radeon_enc_code_ue(enc, enc->enc_pic.session_init.aligned_picture_width);
radeon_enc_code_ue(enc, enc->enc_pic.session_init.aligned_picture_height);
if ((enc->enc_pic.crop_left != 0) || (enc->enc_pic.crop_right != 0) ||
(enc->enc_pic.crop_top != 0) || (enc->enc_pic.crop_bottom != 0)) {
radeon_enc_code_fixed_bits(enc, 0x1, 1);
radeon_enc_code_ue(enc, enc->enc_pic.crop_left);
radeon_enc_code_ue(enc, enc->enc_pic.crop_right);
radeon_enc_code_ue(enc, enc->enc_pic.crop_top);
radeon_enc_code_ue(enc, enc->enc_pic.crop_bottom);
} else
radeon_enc_code_fixed_bits(enc, 0x0, 1);
if ((enc->enc_pic.crop_left != 0) || (enc->enc_pic.crop_right != 0) ||
(enc->enc_pic.crop_top != 0) || (enc->enc_pic.crop_bottom != 0)) {
radeon_enc_code_fixed_bits(enc, 0x1, 1);
radeon_enc_code_ue(enc, enc->enc_pic.crop_left);
radeon_enc_code_ue(enc, enc->enc_pic.crop_right);
radeon_enc_code_ue(enc, enc->enc_pic.crop_top);
radeon_enc_code_ue(enc, enc->enc_pic.crop_bottom);
} else if (enc->enc_pic.session_init.padding_width != 0 ||
enc->enc_pic.session_init.padding_height != 0) {
radeon_enc_code_fixed_bits(enc, 0x1, 1);
radeon_enc_code_ue(enc, enc->enc_pic.session_init.padding_width / 2);
radeon_enc_code_ue(enc, enc->enc_pic.session_init.padding_width / 2);
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);