[AMD Official Use Only - Internal Distribution Only] Acked-by: Deepak Sharma <deepak.sha...@amd.com>
-----Original Message----- From: Sahu, Satyajit <satyajit.s...@amd.com> Sent: Monday, December 2, 2019 8:31 PM To: mesa-dev@lists.freedesktop.org Cc: Zhang, Boyuan <boyuan.zh...@amd.com>; Sharma, Deepak <deepak.sha...@amd.com>; Sahu, Satyajit <satyajit.s...@amd.com> Subject: [PATCH] radeonsi: Add support for midstream bitrate change in encoder Added support for bitrate change in between encoding. Signed-off-by: Satyajit Sahu <mailto:satyajit.s...@amd.com> diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c index 84d3c1e2fa4..7d7a2fa4eb3 100644 --- a/src/gallium/drivers/radeon/radeon_vce.c +++ b/src/gallium/drivers/radeon/radeon_vce.c @@ -268,7 +268,8 @@ static void rvce_begin_frame(struct pipe_video_codec *encoder, enc->pic.rate_ctrl.rate_ctrl_method != pic->rate_ctrl.rate_ctrl_method || enc->pic.quant_i_frames != pic->quant_i_frames || enc->pic.quant_p_frames != pic->quant_p_frames || - enc->pic.quant_b_frames != pic->quant_b_frames; + enc->pic.quant_b_frames != pic->quant_b_frames || + enc->pic.rate_ctrl.target_bitrate != pic->rate_ctrl.target_bitrate; enc->pic = *pic; si_get_pic_param(enc, pic); diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc.c b/src/gallium/drivers/radeon/radeon_vcn_enc.c index aa9182f273b..c4fb9a7bd92 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_enc.c +++ b/src/gallium/drivers/radeon/radeon_vcn_enc.c @@ -247,6 +247,17 @@ 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; + + 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; + need_rate_control = + enc->enc_pic.rc_layer_init.target_bit_rate != pic->rate_ctrl.target_bitrate; + } 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.target_bit_rate != pic->rc.target_bitrate; + } radeon_vcn_enc_get_param(enc, picture); @@ -266,6 +277,10 @@ static void radeon_enc_begin_frame(struct pipe_video_codec *encoder, flush(enc); si_vid_destroy_buffer(&fb); } + if (need_rate_control) { + enc->begin(enc, picture); + flush(enc); + } } static void radeon_enc_encode_bitstream(struct pipe_video_codec *encoder, -- 2.17.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
