mirrors/mpp
1
0
Fork 0
mirror of https://github.com/rockchip-linux/mpp.git synced 2024-11-23 10:04:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[mlvec]: Fix error when ltr_frames larger than 3

Browse Source 
Enlarge max ltr_frames support from 3 to 16.

Change-Id: I2d87a956019cbb4ce807aedc7be2d0c4987fa4d2
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen 2020-09-08 18:21:32 +08:00
parent 74f2f76fd7
commit f1ebb21814
2 changed files with 13 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/rk_venc_ref.h
View File

@ -65,7 +65,7 @@
/* max 4 temporal layer */
#define MPP_ENC_MAX_TEMPORAL_LAYER_NUM 4
/* max 4 long-term reference frame */
#define MPP_ENC_MAX_LT_REF_NUM 4
#define MPP_ENC_MAX_LT_REF_NUM 16
/*
* Group Of Picture (GOP) config is separated into three parts:

63
mpp/legacy/vpu_api_mlvec.cpp
View File

@ -247,7 +247,7 @@ MPP_RET vpu_api_mlvec_set_dy_max_tid(VpuApiMlvec ctx, RK_S32 max_tid)
mpp_assert(mpi);
mpp_assert(enc_cfg);
MppEncRefLtFrmCfg lt_ref[4];
MppEncRefLtFrmCfg lt_ref[16];
MppEncRefStFrmCfg st_ref[16];
RK_S32 lt_cfg_cnt = 0;
RK_S32 st_cfg_cnt = 0;
@ -400,57 +400,18 @@ MPP_RET vpu_api_mlvec_set_dy_max_tid(VpuApiMlvec ctx, RK_S32 max_tid)
} break;
}
switch (ltr_frames) {
case 0 : {
} break;
case 1 : {
lt_ref[0].lt_idx = 0;
lt_ref[0].temporal_id = 0;
lt_ref[0].ref_mode = REF_TO_PREV_LT_REF;
lt_ref[0].lt_gap = 0;
lt_ref[0].lt_delay = 0;
if (ltr_frames) {
RK_S32 i;
lt_cfg_cnt = 1;
} break;
case 2 : {
lt_ref[0].lt_idx = 0;
lt_ref[0].temporal_id = 0;
lt_ref[0].ref_mode = REF_TO_PREV_LT_REF;
lt_ref[0].lt_gap = 0;
lt_ref[0].lt_delay = 0;
lt_ref[1].lt_idx = 1;
lt_ref[1].temporal_id = 0;
lt_ref[1].ref_mode = REF_TO_PREV_LT_REF;
lt_ref[1].lt_gap = 0;
lt_ref[1].lt_delay = tid0_loop;
lt_cfg_cnt = 2;
} break;
case 3 : {
lt_ref[0].lt_idx = 0;
lt_ref[0].temporal_id = 0;
lt_ref[0].ref_mode = REF_TO_PREV_LT_REF;
lt_ref[0].lt_gap = 0;
lt_ref[0].lt_delay = 0;
lt_ref[1].lt_idx = 1;
lt_ref[1].temporal_id = 0;
lt_ref[1].ref_mode = REF_TO_PREV_LT_REF;
lt_ref[1].lt_gap = 0;
lt_ref[1].lt_delay = tid0_loop;
lt_ref[2].lt_idx = 2;
lt_ref[2].temporal_id = 0;
lt_ref[2].ref_mode = REF_TO_PREV_LT_REF;
lt_ref[2].lt_gap = 0;
lt_ref[2].lt_delay = tid0_loop * 2;
lt_cfg_cnt = 3;
} break;
default : {
mpp_err("invalid max LTR frame count %d\n", ltr_frames);
} break;
lt_cfg_cnt = ltr_frames;
mpp_assert(ltr_frames <= MPP_ENC_MAX_LT_REF_NUM);
for (i = 0; i < ltr_frames; i++) {
lt_ref[i].lt_idx = i;
lt_ref[i].temporal_id = 0;
lt_ref[i].ref_mode = REF_TO_PREV_LT_REF;
lt_ref[i].lt_gap = 0;
lt_ref[i].lt_delay = tid0_loop * i;
}
}
if (lt_cfg_cnt)