package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-08 10:30:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[hal_h265e]: Fix rkvenc config issue

Browse Source 
1. fbc body must 4k align so set header len align 8k
2. fix tmvp me_cnst colmv load & store cfg
3. fix pp reg stride set err && add rgb2yuv param cfg
4. slice split in mbnum must minus 1
5. fix sao flag syntax no set

Change-Id: Ic2f73b5c18c2d41de50984df11334110724ecf5a
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
This commit is contained in:
sayon.chen
2020-02-17 16:15:13 +08:00
committed by Herman Chen
parent caee16c968
commit 88b7bfd913
3 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mpp/codec/enc/h265/h265e_syntax.c
View File

@@ -62,6 +62,8 @@ static void fill_picture_parameters(const H265eCtx *h,
pp->num_short_term_ref_pic_sets = sps->m_RPSList.m_numberOfReferencePictureSets; pp->num_short_term_ref_pic_sets = sps->m_RPSList.m_numberOfReferencePictureSets;
pp->num_long_term_ref_pics_sps = sps->m_numLongTermRefPicSPS; pp->num_long_term_ref_pics_sps = sps->m_numLongTermRefPicSPS;
pp->sample_adaptive_offset_enabled_flag = sps->m_bUseSAO;
pp->num_ref_idx_l0_default_active_minus1 = pps->m_numRefIdxL0DefaultActive - 1; pp->num_ref_idx_l0_default_active_minus1 = pps->m_numRefIdxL0DefaultActive - 1;
pp->num_ref_idx_l1_default_active_minus1 = pps->m_numRefIdxL1DefaultActive - 1; pp->num_ref_idx_l1_default_active_minus1 = pps->m_numRefIdxL1DefaultActive - 1;
pp->init_qp_minus26 = pps->m_picInitQPMinus26; pp->init_qp_minus26 = pps->m_picInitQPMinus26;
@@ -122,9 +124,9 @@ static void fill_slice_parameters( const H265eCtx *h,
sp->sli_splt = 1; sp->sli_splt = 1;
sp->sli_splt_mode = codec->slice_cfg.split_mode; sp->sli_splt_mode = codec->slice_cfg.split_mode;
if (codec->slice_cfg.split_mode) { if (codec->slice_cfg.split_mode) {
sp->sli_splt_cnum_m1 = codec->slice_cfg.slice_size; sp->sli_splt_cnum_m1 = codec->slice_cfg.slice_size - 1;
} else { } else {
sp->sli_splt_byte = codec->slice_cfg.slice_size; sp->sli_splt_byte = codec->slice_cfg.slice_size;
} }
sp->sli_max_num_m1 = 50; sp->sli_max_num_m1 = 50;
sp->sli_flsh = 1; sp->sli_flsh = 1;
@@ -169,8 +171,6 @@ static void fill_slice_parameters( const H265eCtx *h,
sp->col_ref_idx = 0; sp->col_ref_idx = 0;
sp->col_frm_l0_flg = slice->m_colFromL0Flag; sp->col_frm_l0_flg = slice->m_colFromL0Flag;
sp->merge_left_flag = codec->merge_cfg.merge_left_flag;
sp->merge_up_flag = codec->merge_cfg.merge_up_flag;
sp->sli_poc_lsb = (slice->poc - slice->last_idr + (1 << slice->m_sps->m_bitsForPOC)) % sp->sli_poc_lsb = (slice->poc - slice->last_idr + (1 << slice->m_sps->m_bitsForPOC)) %
(1 << slice->m_sps->m_bitsForPOC); (1 << slice->m_sps->m_bitsForPOC);
sp->sli_hdr_ext_len = slice->slice_header_extension_length; sp->sli_hdr_ext_len = slice->slice_header_extension_length;

66
mpp/hal/rkenc/h265e/hal_h265e_rkv.c
View File

@@ -245,10 +245,10 @@ static MPP_RET h265e_rkv_allocate_buffers(H265eRkvHalContext *ctx, H265eSyntax_n
MPP_FREE(ctx->roi_buf); MPP_FREE(ctx->roi_buf);
hal_bufs_deinit(ctx->dpb_bufs); hal_bufs_deinit(ctx->dpb_bufs);
hal_bufs_init(&ctx->dpb_bufs); hal_bufs_init(&ctx->dpb_bufs);
fbc_header_len = (mb_wd64 * mb_h64) << 6; fbc_header_len = MPP_ALIGN(((mb_wd64 * mb_h64) << 6), SZ_8K);
size[0] = fbc_header_len + ((mb_wd64 * mb_h64) << 12) * 2; //fbc_h + fbc_b size[0] = fbc_header_len + ((mb_wd64 * mb_h64) << 12) * 2; //fbc_h + fbc_b
size[1] = (mb_wd64 * mb_h64 << 8); size[1] = (mb_wd64 * mb_h64 << 8);
size[2] = (mb_wd64 * mb_h64 * 16 * 4 + 128); size[2] = MPP_ALIGN(mb_wd64 * mb_h64 * 16 * 4, 256);
hal_bufs_setup(ctx->dpb_bufs, 17, 3, size); hal_bufs_setup(ctx->dpb_bufs, 17, 3, size);
if (1) { if (1) {
for (k = 0; k < RKVE_LINKTABLE_FRAME_NUM; k++) { for (k = 0; k < RKVE_LINKTABLE_FRAME_NUM; k++) {
@@ -351,7 +351,7 @@ MPP_RET hal_h265e_rkv_init(void *hal, MppEncHalCfg *cfg)
return MPP_ERR_MALLOC; return MPP_ERR_MALLOC;
} }
} }
ctx->frame_type = INTRA_FRAME;
h265e_rkv_set_l2_regs(ctx, (H265eRkvL2RegSet*)ctx->l2_regs); h265e_rkv_set_l2_regs(ctx, (H265eRkvL2RegSet*)ctx->l2_regs);
h265e_hal_leave(); h265e_hal_leave();
return ret; return ret;
@@ -705,23 +705,38 @@ static MPP_RET h265e_rkv_set_pp_regs(H265eRkvRegSet *regs, VepuFmtCfg *fmt, MppE
regs->src_fmt.src_range = fmt->src_range; regs->src_fmt.src_range = fmt->src_range;
regs->src_proc.src_rot = prep_cfg->rotation; regs->src_proc.src_rot = prep_cfg->rotation;
if (prep_cfg->hor_stride) { stridey = prep_cfg->hor_stride ? prep_cfg->hor_stride : prep_cfg->width;
stridey = prep_cfg->hor_stride;
} else {
stridey = prep_cfg->width ;
if (regs->src_fmt.src_cfmt == VEPU541_FMT_BGRA8888 )
stridey = (stridey + 1) * 4;
else if (regs->src_fmt.src_cfmt == VEPU541_FMT_BGR888 )
stridey = (stridey + 1) * 3;
else if ( regs->src_fmt.src_cfmt == VEPU541_FMT_BGR565
|| regs->src_fmt.src_cfmt == VEPU541_FMT_YUYV422
|| regs->src_fmt.src_cfmt == VEPU541_FMT_UYVY422 )
stridey = (stridey + 1) * 2;
}
stridec = (regs->src_fmt.src_cfmt == VEPU541_FMT_YUV422SP if (regs->src_fmt.src_cfmt == VEPU541_FMT_BGRA8888 )
|| regs->src_fmt.src_cfmt == VEPU541_FMT_YUV420SP) stridey = stridey * 4;
? stridey : stridey / 2; else if (regs->src_fmt.src_cfmt == VEPU541_FMT_BGR888 )
stridey = stridey * 3;
else if (regs->src_fmt.src_cfmt == VEPU541_FMT_BGR565 ||
regs->src_fmt.src_cfmt == VEPU541_FMT_YUYV422 ||
regs->src_fmt.src_cfmt == VEPU541_FMT_UYVY422)
stridey = stridey * 2;
stridec = (regs->src_fmt.src_cfmt == VEPU541_FMT_YUV422SP ||
regs->src_fmt.src_cfmt == VEPU541_FMT_YUV420SP) ?
stridey : stridey / 2;
if (regs->src_fmt.src_cfmt < VEPU541_FMT_NONE) {
regs->src_udfy.wght_r2y = 66;
regs->src_udfy.wght_g2y = 129;
regs->src_udfy.wght_b2y = 25;
regs->src_udfu.wght_r2u = -38;
regs->src_udfu.wght_g2u = -74;
regs->src_udfu.wght_b2u = 112;
regs->src_udfv.wght_r2v = 112;
regs->src_udfv.wght_g2v = -94;
regs->src_udfv.wght_b2v = -18;
regs->src_udfo.ofst_y = 16;
regs->src_udfo.ofst_u = 128;
regs->src_udfo.ofst_v = 128;
}
regs->src_strid.src_ystrid = stridey; regs->src_strid.src_ystrid = stridey;
regs->src_strid.src_cstrid = stridec; regs->src_strid.src_cstrid = stridec;
@@ -847,7 +862,7 @@ MPP_RET hal_h265e_rkv_gen_regs(void *hal, HalEncTask *task)
pic_wd64 = (syn->pp.pic_width + 63) / 64; pic_wd64 = (syn->pp.pic_width + 63) / 64;
pic_h64 = (syn->pp.pic_height + 63) / 64; pic_h64 = (syn->pp.pic_height + 63) / 64;
fbc_header_len = (pic_wd64 * pic_h64) << 6; fbc_header_len = MPP_ALIGN(((pic_wd64 * pic_h64) << 6), SZ_8K);
h265e_hal_dbg(H265E_DBG_SIMPLE, h265e_hal_dbg(H265E_DBG_SIMPLE,
"frame %d | type %d | start gen regs", "frame %d | type %d | start gen regs",
ctx->frame_cnt, ctx->frame_type); ctx->frame_cnt, ctx->frame_type);
@@ -1028,6 +1043,15 @@ MPP_RET hal_h265e_rkv_gen_regs(void *hal, HalEncTask *task)
regs->me_cnst.mv_limit = 0; regs->me_cnst.mv_limit = 0;
regs->me_cnst.mv_num = 2; regs->me_cnst.mv_num = 2;
if (syn->pp.sps_temporal_mvp_enabled_flag &&
(ctx->frame_type != INTRA_FRAME)) {
if (ctx->last_frame_type == INTRA_FRAME) {
regs->me_cnst.colmv_load = 0;
} else {
regs->me_cnst.colmv_load = 1;
}
regs->me_cnst.colmv_store = 1;
}
if (syn->pp.pic_width > 2688) { if (syn->pp.pic_width > 2688) {
regs->me_ram.cime_rama_h = 12; regs->me_ram.cime_rama_h = 12;
@@ -1385,7 +1409,7 @@ MPP_RET hal_h265e_rkv_get_task(void *hal, HalEncTask *task)
} }
ctx->alloc_flg = 1; ctx->alloc_flg = 1;
} }
ctx->last_frame_type = ctx->frame_type;
if (frms->status.is_intra) { if (frms->status.is_intra) {
ctx->frame_type = INTRA_FRAME; ctx->frame_type = INTRA_FRAME;
} else { } else {

1
mpp/hal/rkenc/h265e/hal_h265e_rkv_ctx.h
View File

@@ -66,6 +66,7 @@ typedef struct H265eRkvHalContext_t {
RK_S32 pre_p_qp; RK_S32 pre_p_qp;
RK_S32 start_qp; RK_S32 start_qp;
RK_S32 frame_type; RK_S32 frame_type;
RK_S32 last_frame_type;
/* @frame_cnt starts from ZERO */ /* @frame_cnt starts from ZERO */
RK_U32 frame_cnt; RK_U32 frame_cnt;