diff --git a/inc/rk_venc_cmd.h b/inc/rk_venc_cmd.h index 9ba782c0..2453b9fe 100644 --- a/inc/rk_venc_cmd.h +++ b/inc/rk_venc_cmd.h @@ -486,20 +486,6 @@ typedef struct MppEncH264VuiCfg_t { /* FIXME to complete */ } MppEncH264VuiCfg; -typedef struct MppEncH264RefCfg_t { - RK_S32 i_frame_reference; /* Maximum number of reference frames */ - RK_S32 i_ref_pos; - RK_S32 i_long_term_en; - RK_S32 i_long_term_internal; - RK_S32 hw_longterm_mode; - RK_S32 i_dpb_size; /* Force a DPB size larger than that implied by B-frames and reference frames. - * Useful in combination with interactive error resilience. */ -} MppEncH264RefCfg; - -typedef struct MppEncH264SeiCfg_t { - RK_U32 change; -} MppEncH264SeiCfg; - typedef enum MppEncH264CfgChange_e { /* change on stream type */ MPP_ENC_H264_CFG_STREAM_TYPE = (1 << 0), @@ -530,39 +516,9 @@ typedef enum MppEncH264CfgChange_e { /* change on vui */ MPP_ENC_H264_CFG_CHANGE_VUI = (1 << 28), - /* change on sei */ - MPP_ENC_H264_CFG_CHANGE_SEI = (1 << 29), - MPP_ENC_H264_CFG_CHANGE_REF = (1 << 30), MPP_ENC_H264_CFG_CHANGE_ALL = (0xFFFFFFFF), } MppEncH264CfgChange; -typedef struct MppEncH264IntraPred_t { - RK_S32 constrained_intra_pred_mode; -} MppEncH264IntraPred; - -typedef struct MppEncH264InterPred_t { - RK_S32 reserve; -} MppEncH264InterPred; - -typedef struct MppEncH264Trans_t { - RK_S32 trans_mode; - RK_S32 scaling_list_enable; - RK_S8 inter_scaling_list_8x8[64]; - RK_S8 intra_scaling_list_8x8[64]; - RK_S8 chroma_qp_offset;; -} MppEncH264Trans; - -typedef struct MppEncH264Entropy_t { - RK_S32 entropy_coding_mode; - RK_S32 cabac_init_idc; -} MppEncH264Entropy; - -typedef struct MppEncH264Dblk_t { - RK_S32 deblock_disable; - RK_S32 deblock_offset_alpha; - RK_S32 deblock_offset_beta; -} MppEncH264Dblk; - typedef struct MppEncH264Cfg_t { RK_U32 change; @@ -685,12 +641,10 @@ typedef struct MppEncH264Cfg_t { /* extra info */ MppEncH264VuiCfg vui; - MppEncH264SeiCfg sei; - MppEncH264RefCfg ref; } MppEncH264Cfg; - #define H265E_MAX_ROI_NUMBER 64 + typedef struct H265eRect_t { RK_S32 left; RK_S32 right; diff --git a/mpp/codec/enc/h264/h264e_api_v2.c b/mpp/codec/enc/h264/h264e_api_v2.c index 68de79c2..54fedd03 100644 --- a/mpp/codec/enc/h264/h264e_api_v2.c +++ b/mpp/codec/enc/h264/h264e_api_v2.c @@ -391,9 +391,6 @@ static MPP_RET h264e_proc_h264_cfg(MppEncH264Cfg *dst, MppEncH264Cfg *src) if (change & MPP_ENC_H264_CFG_CHANGE_VUI) { dst->vui = src->vui; } - if (change & MPP_ENC_H264_CFG_CHANGE_SEI) { - dst->sei = src->sei; - } dst->change |= change; return ret; diff --git a/mpp/hal/common/h264/hal_h264e_api.c b/mpp/hal/common/h264/hal_h264e_api.c index 1eb6243e..f7a20f09 100644 --- a/mpp/hal/common/h264/hal_h264e_api.c +++ b/mpp/hal/common/h264/hal_h264e_api.c @@ -40,7 +40,6 @@ static MPP_RET hal_h264e_init(void *hal, MppHalCfg *cfg) MppEncCodecCfg *codec = &cfg->cfg->codec; MppEncH264Cfg *h264 = &codec->h264; MppEncH264VuiCfg *vui = &h264->vui; - MppEncH264RefCfg *ref = &h264->ref; H264eHwCfg *hw_cfg = &ctx->hw_cfg; RK_U32 vcodec_type = 0; @@ -112,16 +111,8 @@ static MPP_RET hal_h264e_init(void *hal, MppHalCfg *cfg) h264->slice_mode = 0; h264->slice_arg = 0; h264->vui.change = 0; - h264->sei.change = 0; - vui->b_vui = 1; - - ref->i_frame_reference = H264E_NUM_REFS; - ref->i_dpb_size = H264E_NUM_REFS; - ref->i_ref_pos = 1; - ref->i_long_term_en = H264E_LONGTERM_REF_EN; - ref->hw_longterm_mode = 0; - ref->i_long_term_internal = 0; + vui->b_vui = 1; ctx->cfg = cfg->cfg; ctx->set = cfg->set; diff --git a/mpp/hal/common/h264/hal_h264e_com.c b/mpp/hal/common/h264/hal_h264e_com.c index 9453491a..d804e488 100644 --- a/mpp/hal/common/h264/hal_h264e_com.c +++ b/mpp/hal/common/h264/hal_h264e_com.c @@ -470,7 +470,6 @@ MPP_RET h264e_set_sps(H264eHalContext *ctx, H264eSps *sps) MppEncPrepCfg *prep = &ctx->cfg->prep; MppEncRcCfg *rc = &ctx->cfg->rc; MppEncH264VuiCfg *vui = &codec->vui; - MppEncH264RefCfg *ref = &codec->ref; RK_S32 max_frame_num = 0; /* default settings */ @@ -499,8 +498,8 @@ MPP_RET h264e_set_sps(H264eHalContext *ctx, H264eSps *sps) RK_S32 b_pic_struct = 0; RK_S32 analyse_mv_range = 128; //TODO: relative to level_idc, transplant x264_validate_levels. RK_S32 csp = 0; - RK_S32 i_dpb_size = ref->i_dpb_size; - RK_S32 i_frame_reference = ref->i_frame_reference; + RK_S32 i_dpb_size = 1; + RK_S32 i_frame_reference = 1; csp = h264e_set_format(hw_cfg, prep); sps->i_id = 0; diff --git a/mpp/hal/rkenc/h264e/hal_h264e_rkv.c b/mpp/hal/rkenc/h264e/hal_h264e_rkv.c index 353310ce..798bcfd6 100644 --- a/mpp/hal/rkenc/h264e/hal_h264e_rkv.c +++ b/mpp/hal/rkenc/h264e/hal_h264e_rkv.c @@ -1912,9 +1912,6 @@ MPP_RET hal_h264e_rkv_control(void *hal, MpiCmd cmd_type, void *param) if (change & MPP_ENC_H264_CFG_CHANGE_VUI) { dst->vui = src->vui; } - if (change & MPP_ENC_H264_CFG_CHANGE_SEI) { - dst->sei = src->sei; - } /* * NOTE: use OR here for avoiding overwrite on multiple config diff --git a/mpp/hal/vpu/h264e/hal_h264e_vepu1.c b/mpp/hal/vpu/h264e/hal_h264e_vepu1.c index e6e3cac7..ecccf9bb 100644 --- a/mpp/hal/vpu/h264e/hal_h264e_vepu1.c +++ b/mpp/hal/vpu/h264e/hal_h264e_vepu1.c @@ -738,9 +738,6 @@ MPP_RET hal_h264e_vepu1_control(void *hal, MpiCmd cmd_type, void *param) if (change & MPP_ENC_H264_CFG_CHANGE_VUI) { dst->vui = src->vui; } - if (change & MPP_ENC_H264_CFG_CHANGE_SEI) { - dst->sei = src->sei; - } /* * NOTE: use OR here for avoiding overwrite on multiple config diff --git a/mpp/hal/vpu/h264e/hal_h264e_vepu2.c b/mpp/hal/vpu/h264e/hal_h264e_vepu2.c index d0ee2c59..7f9eddb9 100644 --- a/mpp/hal/vpu/h264e/hal_h264e_vepu2.c +++ b/mpp/hal/vpu/h264e/hal_h264e_vepu2.c @@ -768,9 +768,6 @@ MPP_RET hal_h264e_vepu2_control(void *hal, MpiCmd cmd_type, void *param) if (change & MPP_ENC_H264_CFG_CHANGE_VUI) { dst->vui = src->vui; } - if (change & MPP_ENC_H264_CFG_CHANGE_SEI) { - dst->sei = src->sei; - } /* * NOTE: use OR here for avoiding overwrite on multiple config