Module: Mesa Branch: main Commit: 72fffa62d574a43aedd2b9c5e772e18d1240589c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=72fffa62d574a43aedd2b9c5e772e18d1240589c
Author: Ruijing Dong <[email protected]> Date: Sat Sep 10 16:19:09 2022 -0400 frontend/va: remove some unnecessary code clean up some code related to h264 encoding. Signed-off-by: Ruijing Dong <[email protected]> Reviewed-By: Sil Vilerino <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18534> --- src/gallium/frontends/va/picture_h264_enc.c | 13 ------------- src/gallium/include/pipe/p_video_state.h | 1 - 2 files changed, 14 deletions(-) diff --git a/src/gallium/frontends/va/picture_h264_enc.c b/src/gallium/frontends/va/picture_h264_enc.c index a02ed9439ab..abe9c1ba4e7 100644 --- a/src/gallium/frontends/va/picture_h264_enc.c +++ b/src/gallium/frontends/va/picture_h264_enc.c @@ -259,18 +259,6 @@ vlVaHandleVAEncMiscParameterTypeQualityLevelH264(vlVaContext *context, VAEncMisc void getEncParamPresetH264(vlVaContext *context) { - //motion estimation preset - context->desc.h264enc.motion_est.motion_est_quarter_pixel = 0; - context->desc.h264enc.motion_est.lsmvert = 0; - context->desc.h264enc.motion_est.enc_disable_sub_mode = 254; - context->desc.h264enc.motion_est.enc_en_ime_overw_dis_subm = 0; - context->desc.h264enc.motion_est.enc_ime_overw_dis_subm_no = 0; - context->desc.h264enc.motion_est.enc_ime2_search_range_x = 1; - context->desc.h264enc.motion_est.enc_ime2_search_range_y = 1; - - //pic control preset - context->desc.h264enc.pic_ctrl.enc_constraint_set_flags = 0x00000040; - //rate control context->desc.h264enc.rate_ctrl[0].vbv_buffer_size = 20000000; context->desc.h264enc.rate_ctrl[0].vbv_buf_lv = 48; @@ -292,5 +280,4 @@ void getEncParamPresetH264(vlVaContext *context) context->desc.h264enc.rate_ctrl[0].frame_rate_num); context->desc.h264enc.rate_ctrl[0].peak_bits_picture_fraction = 0; - context->desc.h264enc.ref_pic_mode = 0x00000201; } diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h index 7948e62a5ba..a503081048b 100755 --- a/src/gallium/include/pipe/p_video_state.h +++ b/src/gallium/include/pipe/p_video_state.h @@ -446,7 +446,6 @@ struct pipe_h264_enc_picture_desc unsigned ref_idx_l0_list[32]; unsigned ref_idx_l1_list[32]; unsigned gop_size; - unsigned ref_pic_mode; unsigned num_temporal_layers; struct pipe_enc_quality_modes quality_modes;
