radeonsi/vcn: Only enable VBAQ with rate control mode

Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10020
Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28945>
(cherry picked from commit bc72126cb4)
This commit is contained in:
David Rosca 2024-04-26 08:41:09 +02:00 committed by Eric Engestrom
parent 526eeb0b86
commit 69ca6360f7
4 changed files with 10 additions and 4 deletions

View file

@ -84,7 +84,7 @@
"description": "radeonsi/vcn: Only enable VBAQ with rate control mode",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

View file

@ -222,7 +222,9 @@ static void radeon_enc_deblocking_filter_hevc(struct radeon_encoder *enc)
static void radeon_enc_quality_params(struct radeon_encoder *enc)
{
enc->enc_pic.quality_params.vbaq_mode = enc->enc_pic.quality_modes.vbaq_mode;
enc->enc_pic.quality_params.vbaq_mode =
enc->enc_pic.rc_session_init.rate_control_method != RENCODE_RATE_CONTROL_METHOD_NONE ?
enc->enc_pic.quality_modes.vbaq_mode : 0;
enc->enc_pic.quality_params.scene_change_sensitivity = 0;
enc->enc_pic.quality_params.scene_change_min_idr_interval = 0;
enc->enc_pic.quality_params.two_pass_search_center_map_mode =

View file

@ -67,7 +67,9 @@ static void radeon_enc_op_preset(struct radeon_encoder *enc)
static void radeon_enc_quality_params(struct radeon_encoder *enc)
{
enc->enc_pic.quality_params.vbaq_mode = enc->enc_pic.quality_modes.vbaq_mode;
enc->enc_pic.quality_params.vbaq_mode =
enc->enc_pic.rc_session_init.rate_control_method != RENCODE_RATE_CONTROL_METHOD_NONE ?
enc->enc_pic.quality_modes.vbaq_mode : 0;
enc->enc_pic.quality_params.scene_change_sensitivity = 0;
enc->enc_pic.quality_params.scene_change_min_idr_interval = 0;
enc->enc_pic.quality_params.two_pass_search_center_map_mode =

View file

@ -98,7 +98,9 @@ static void radeon_enc_encode_params_h264(struct radeon_encoder *enc)
static void radeon_enc_quality_params(struct radeon_encoder *enc)
{
enc->enc_pic.quality_params.vbaq_mode = enc->enc_pic.quality_modes.vbaq_mode;
enc->enc_pic.quality_params.vbaq_mode =
enc->enc_pic.rc_session_init.rate_control_method != RENCODE_RATE_CONTROL_METHOD_NONE ?
enc->enc_pic.quality_modes.vbaq_mode : 0;
enc->enc_pic.quality_params.scene_change_sensitivity = 0;
enc->enc_pic.quality_params.scene_change_min_idr_interval = 0;
enc->enc_pic.quality_params.two_pass_search_center_map_mode =