From 31c4087cb34d9a37ced6b03bd7bdcdecdf76b30a Mon Sep 17 00:00:00 2001 From: Ruijing Dong Date: Tue, 11 Apr 2023 14:59:05 -0400 Subject: [PATCH] frontends/va: disable skip_frame_enable in vaapi interface. skip_frame_enable is for preventing overshooting in some cases, however the tests in FW were broken, and the output result shows the functionality has not completed yet, which is the reason this should be disabled at the moment until it has been fully verified. Cc: mesa-stable Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8178 Reviewed-by: Boyuan Zhang Signed-off-by: Ruijing Dong Part-of: --- src/gallium/frontends/va/picture_h264_enc.c | 3 ++- src/gallium/frontends/va/picture_hevc_enc.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/frontends/va/picture_h264_enc.c b/src/gallium/frontends/va/picture_h264_enc.c index 79e23d4..0cdb6a6 100644 --- a/src/gallium/frontends/va/picture_h264_enc.c +++ b/src/gallium/frontends/va/picture_h264_enc.c @@ -251,7 +251,8 @@ vlVaHandleVAEncMiscParameterTypeRateControlH264(vlVaContext *context, VAEncMiscP return VA_STATUS_ERROR_INVALID_PARAMETER; context->desc.h264enc.rate_ctrl[temporal_id].fill_data_enable = !(rc->rc_flags.bits.disable_bit_stuffing); - context->desc.h264enc.rate_ctrl[temporal_id].skip_frame_enable = !(rc->rc_flags.bits.disable_frame_skip); + /* context->desc.h264enc.rate_ctrl[temporal_id].skip_frame_enable = !(rc->rc_flags.bits.disable_frame_skip); */ + context->desc.h264enc.rate_ctrl[temporal_id].skip_frame_enable = 0; context->desc.h264enc.rate_ctrl[temporal_id].peak_bitrate = rc->bits_per_second; if ((context->desc.h264enc.rate_ctrl[0].rate_ctrl_method == PIPE_H2645_ENC_RATE_CONTROL_METHOD_CONSTANT) || diff --git a/src/gallium/frontends/va/picture_hevc_enc.c b/src/gallium/frontends/va/picture_hevc_enc.c index 5826d75..4a9aa59 100644 --- a/src/gallium/frontends/va/picture_hevc_enc.c +++ b/src/gallium/frontends/va/picture_hevc_enc.c @@ -235,7 +235,8 @@ vlVaHandleVAEncMiscParameterTypeRateControlHEVC(vlVaContext *context, VAEncMiscP context->desc.h265enc.rc.vbv_buffer_size = context->desc.h265enc.rc.target_bitrate; context->desc.h265enc.rc.fill_data_enable = !(rc->rc_flags.bits.disable_bit_stuffing); - context->desc.h265enc.rc.skip_frame_enable = !(rc->rc_flags.bits.disable_frame_skip); + /* context->desc.h265enc.rc.skip_frame_enable = !(rc->rc_flags.bits.disable_frame_skip); */ + context->desc.h265enc.rc.skip_frame_enable = 0; context->desc.h265enc.rc.max_qp = rc->max_qp; context->desc.h265enc.rc.min_qp = rc->min_qp; -- 2.7.4