From 46415c169d4d701127d9a544438b739619ab49d6 Mon Sep 17 00:00:00 2001 From: Krunal Patel Date: Thu, 29 Oct 2020 14:48:16 +0530 Subject: [PATCH] radeon/vcn: Bitrate not updated when changing framerate Issue: Encoding parameters not updated after changing FrameRate Root Cause: In radeon_enc_begin_frame, there is a parameter need_rate_control which was enabled only if the bitrate is changed. Due to this the radeon_enc_rc_layer_init was not updating the encoder parameters with new framerate, peak_bits_per_picture_integer and avg_target_bits_per_picture Fix: Added the condition where we will check if there is a change in other parameters and enable rate control. Eventually updating the encoder parameters with new framerate and bitrate. Signed-off-by: Krunal Patel Reviewed-by: Boyuan Zhang boyuan.zhang@amd.com Part-of: (cherry picked from commit 4143572f93ecf8a4c20d02b42d14adc275b235c0) --- src/gallium/drivers/radeon/radeon_vcn_enc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc.c b/src/gallium/drivers/radeon/radeon_vcn_enc.c index 9b7403d0cee..2f32b2a82ad 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_enc.c +++ b/src/gallium/drivers/radeon/radeon_vcn_enc.c @@ -271,7 +271,9 @@ static void radeon_enc_begin_frame(struct pipe_video_codec *encoder, 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; + (enc->enc_pic.rc_layer_init.target_bit_rate != pic->rate_ctrl.target_bitrate) || + (enc->enc_pic.rc_layer_init.frame_rate_num != pic->rate_ctrl.frame_rate_num) || + (enc->enc_pic.rc_layer_init.frame_rate_den != pic->rate_ctrl.frame_rate_den); } 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;