Module: Mesa Branch: main Commit: ef76b83633dc34eefed11f295cb3185c3991fecd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef76b83633dc34eefed11f295cb3185c3991fecd
Author: SureshGuttula <[email protected]> Date: Thu May 12 08:55:19 2022 +0530 radeonsi: Set display_remote for non-refernced frames When we do SVC temporal encoding, we see output bitsream is not proper. To fix this , incase of SVC passing session init varaible display_remote as enable. Signed-off-by: SureshGuttula <[email protected]> Reviewed-by: Thong Thai <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16468> --- src/gallium/drivers/radeonsi/radeon_vcn_enc.c | 6 +++++- src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c index 0ae9b9ce881..e18fb89d236 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c @@ -357,6 +357,7 @@ static void radeon_enc_begin_frame(struct pipe_video_codec *encoder, struct radeon_encoder *enc = (struct radeon_encoder *)encoder; struct vl_video_buffer *vid_buf = (struct vl_video_buffer *)source; bool need_rate_control = false; + bool not_ref = false; if (u_reduce_video_profile(enc->base.profile) == PIPE_VIDEO_FORMAT_MPEG4_AVC) { struct pipe_h264_enc_picture_desc *pic = (struct pipe_h264_enc_picture_desc *)picture; @@ -364,6 +365,9 @@ static void radeon_enc_begin_frame(struct pipe_video_codec *encoder, (enc->enc_pic.rc_layer_init[0].target_bit_rate != pic->rate_ctrl[0].target_bitrate) || (enc->enc_pic.rc_layer_init[0].frame_rate_num != pic->rate_ctrl[0].frame_rate_num) || (enc->enc_pic.rc_layer_init[0].frame_rate_den != pic->rate_ctrl[0].frame_rate_den); + + if (enc->enc_pic.not_referenced != pic->not_referenced) + not_ref = true; } else if (u_reduce_video_profile(picture->profile) == PIPE_VIDEO_FORMAT_HEVC) { struct pipe_h265_enc_picture_desc *pic = (struct pipe_h265_enc_picture_desc *)picture; need_rate_control = enc->enc_pic.rc_layer_init[0].target_bit_rate != pic->rc.target_bitrate; @@ -395,7 +399,7 @@ static void radeon_enc_begin_frame(struct pipe_video_codec *encoder, flush(enc); si_vid_destroy_buffer(&fb); } - if (need_rate_control) { + if (need_rate_control || not_ref) { enc->begin(enc); flush(enc); } 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 bad6c959460..d279f8c9bd5 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c @@ -104,7 +104,11 @@ static void radeon_enc_session_init(struct radeon_encoder *enc) enc->enc_pic.session_init.aligned_picture_height - enc->base.height; enc->enc_pic.session_init.pre_encode_mode = RENCODE_PREENCODE_MODE_NONE; enc->enc_pic.session_init.pre_encode_chroma_enabled = false; - enc->enc_pic.session_init.display_remote = 0; + + if (enc->enc_pic.not_referenced) + enc->enc_pic.session_init.display_remote = 1; + else + enc->enc_pic.session_init.display_remote = 0; RADEON_ENC_BEGIN(enc->cmd.session_init); RADEON_ENC_CS(enc->enc_pic.session_init.encode_standard);
