<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-2"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="EN-CA" link="blue" vlink="purple"> <div class="WordSection1"> Patch is <o:p></o:p> Reviewed-by: Boyuan Zhang <<a href="mailto:Boyuan.Zhang@amd.com">Boyuan.Zhang@amd.com</a>><o:p></o:p> <o:p> </o:p> Regards,<o:p></o:p> Boyuan<o:p></o:p> <o:p> </o:p> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm"> From: Liu, Leo <Leo.Liu@amd.com> Sent: December 3, 2019 9:08 PM To: Marek Olšák <maraeo@gmail.com>; Sahu, Satyajit <Satyajit.Sahu@amd.com>; Zhang, Boyuan <Boyuan.Zhang@amd.com> Cc: ML Mesa-dev <mesa-dev@lists.freedesktop.org>; Sharma, Deepak <Deepak.Sharma@amd.com> Subject: Re: [Mesa-dev] [PATCH] radeonsi: Add support for midstream bitrate change in encoder<o:p></o:p> </div> </div> <o:p> </o:p> +Boyuan <o:p></o:p> <div class="MsoNormal" align="center" style="text-align:center"> <hr size="2" width="98%" align="center"> </div> <div id="divRplyFwdMsg"> From: Marek Olšák <<a href="mailto:maraeo@gmail.com">maraeo@gmail.com</a>> Sent: December 3, 2019 7:21:23 PM To: Sahu, Satyajit <<a href="mailto:Satyajit.Sahu@amd.com">Satyajit.Sahu@amd.com</a>>; Liu, Leo <<a href="mailto:Leo.Liu@amd.com">Leo.Liu@amd.com</a>> Cc: ML Mesa-dev <<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a>>; Sharma, Deepak <<a href="mailto:Deepak.Sharma@amd.com">Deepak.Sharma@amd.com</a>> Subject: Re: [Mesa-dev] [PATCH] radeonsi: Add support for midstream bitrate change in encoder <o:p></o:p> <div> <o:p></o:p> </div> </div> <div> <div> +Leo<o:p></o:p> </div> <o:p> </o:p> <div> <div> On Mon, Dec 2, 2019 at 11:31 PM Satyajit Sahu <<a href="mailto:satyajit.sahu@amd.com">satyajit.sahu@amd.com</a>> wrote:<o:p></o:p> </div> <blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0cm 0cm 0cm 6.0pt;margin-left:4.8pt;margin-right:0cm"> Added support for bitrate change in between encoding. Signed-off-by: Satyajit Sahu <<a href="mailto:satyajit.sahu@amd.com" target="_blank">satyajit.sahu@amd.com</a>> 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 <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a> <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Fmesa-dev&data=02%7C01%7Cleo.liu%40amd.com%7Cae84ee699f3246cb915708d7784ffad3%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637110157225190450&sdata=dw2yJa%2BgZ3t1BlOH87PypwWIhmH2y7pZ8vU5SiWBkO8%3D&reserved=0" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><o:p></o:p> </blockquote> </div> </div> </div> </body> </html>