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

[vepu541_h264e]: Video quality fine tuning

Browse Source 
1. Increase Intra frame quality.
2. Disable some options.
3. Change default parameter table.

Change-Id: Iee2494eb92217c33313a117969b1e080a8630468
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2020-09-17 20:33:55 +08:00
parent 693facdf9e
commit a2cc66bc7a
3 changed files with 85 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mpp/codec/enc/h264/h264e_api_v2.c
View File

@@ -106,7 +106,7 @@ static void init_h264e_cfg_set(MppEncCfgSet *cfg, MppDeviceId dev_id)
h264->qp_max_i = 0; h264->qp_max_i = 0;
h264->qp_min_i = 0; h264->qp_min_i = 0;
h264->qp_max_step = 8; h264->qp_max_step = 8;
h264->qp_delta_ip = 3; h264->qp_delta_ip = 8;
switch (dev_id) { switch (dev_id) {
case DEV_VEPU : { case DEV_VEPU : {

5
mpp/codec/rc/rc_model_v2.c
View File

@@ -203,7 +203,7 @@ void bits_frm_init(RcModelV2Ctx *ctx)
RK_U32 p_bit = 0; RK_U32 p_bit = 0;
switch (ctx->usr_cfg.gop_mode) { switch (ctx->usr_cfg.gop_mode) {
case NORMAL_P: { case NORMAL_P: {
ctx->i_scale = 160; ctx->i_scale = 480;
ctx->p_scale = 16; ctx->p_scale = 16;
if (gop_len <= 1) if (gop_len <= 1)
p_bit = ctx->gop_total_bits * 16; p_bit = ctx->gop_total_bits * 16;
@@ -258,7 +258,7 @@ MPP_RET bits_model_init(RcModelV2Ctx *ctx)
} }
if (ctx->usr_cfg.max_i_bit_prop <= 0) { if (ctx->usr_cfg.max_i_bit_prop <= 0) {
ctx->usr_cfg.max_i_bit_prop = 10; ctx->usr_cfg.max_i_bit_prop = 30;
} else if (ctx->usr_cfg.max_i_bit_prop > 100) { } else if (ctx->usr_cfg.max_i_bit_prop > 100) {
ctx->usr_cfg.max_i_bit_prop = 100; ctx->usr_cfg.max_i_bit_prop = 100;
} }
@@ -1284,6 +1284,7 @@ MPP_RET rc_model_v2_hal_start(void *ctx, EncRcTask *task)
} }
} }
dealt_qp = mpp_clip(dealt_qp, 5, p->usr_cfg.i_quality_delta);
if (p->usr_cfg.i_quality_delta) { if (p->usr_cfg.i_quality_delta) {
p->start_qp -= dealt_qp; p->start_qp -= dealt_qp;
} }

140
mpp/hal/rkenc/h264e/hal_h264e_vepu541.c
View File

@@ -682,15 +682,15 @@ static void setup_vepu541_rdo_pred(Vepu541H264eRegSet *regs, SynH264eSps *sps,
regs->reg102.rect_size = (sps->profile_idc == H264_PROFILE_BASELINE && regs->reg102.rect_size = (sps->profile_idc == H264_PROFILE_BASELINE &&
sps->level_idc <= H264_LEVEL_3_0) ? 1 : 0; sps->level_idc <= H264_LEVEL_3_0) ? 1 : 0;
regs->reg102.inter_4x4 = (sps->level_idc > H264_LEVEL_4_2) ? 0 : 1; regs->reg102.inter_4x4 = 0;
regs->reg102.vlc_lmt = (sps->profile_idc < H264_PROFILE_MAIN) && regs->reg102.vlc_lmt = (sps->profile_idc < H264_PROFILE_MAIN) &&
!pps->entropy_coding_mode; !pps->entropy_coding_mode;
regs->reg102.chrm_spcl = 1; regs->reg102.chrm_spcl = 1;
regs->reg102.rdo_mask = 0; regs->reg102.rdo_mask = 24;
regs->reg102.ccwa_e = 0; regs->reg102.ccwa_e = 0;
regs->reg102.scl_lst_sel = pps->pic_scaling_matrix_present; regs->reg102.scl_lst_sel = pps->pic_scaling_matrix_present;
regs->reg102.atr_e = 1; regs->reg102.atr_e = 1;
regs->reg102.atf_edg = 3; regs->reg102.atf_edg = 0;
regs->reg102.atf_lvl_e = 1; regs->reg102.atf_lvl_e = 1;
regs->reg102.atf_intra_e = 1; regs->reg102.atf_intra_e = 1;
@@ -1024,7 +1024,7 @@ static void setup_vepu541_me(Vepu541H264eRegSet *regs, SynH264eSps *sps,
regs->reg090.pmv_mdst_v = 0; regs->reg090.pmv_mdst_v = 0;
} else { } else {
regs->reg090.pmv_mdst_h = 5; regs->reg090.pmv_mdst_h = 5;
regs->reg090.pmv_mdst_v = 0; regs->reg090.pmv_mdst_v = 5;
} }
regs->reg090.mv_limit = 2; regs->reg090.mv_limit = 2;
regs->reg090.pmv_num = 2; regs->reg090.pmv_num = 2;
@@ -1094,35 +1094,42 @@ static RK_U32 h264e_wgt_qp_grpa_default[52] = {
}; };
static RK_U32 h264e_wgt_qp_grpb_default[52] = { static RK_U32 h264e_wgt_qp_grpb_default[52] = {
0x0000000e, 0x00000012, 0x00000016, 0x0000001c, 0x00000000, 0x00000001, 0x00000002, 0x00000003,
0x00000024, 0x0000002d, 0x00000039, 0x00000048, 0x00000004, 0x00000005, 0x00000006, 0x00000007,
0x0000005b, 0x00000073, 0x00000091, 0x000000b6, 0x00000008, 0x00000009, 0x0000000a, 0x0000000b,
0x000000e6, 0x00000122, 0x0000016d, 0x000001cc, 0x0000000c, 0x0000000d, 0x0000000e, 0x00000012,
0x00000244, 0x000002db, 0x00000399, 0x00000489, 0x00000016, 0x0000001c, 0x00000024, 0x0000002d,
0x000005b6, 0x00000733, 0x00000912, 0x00000b6d, 0x00000039, 0x00000048, 0x0000005b, 0x00000073,
0x00000e66, 0x00001224, 0x000016db, 0x00001ccc, 0x00000091, 0x000000b6, 0x000000e6, 0x00000122,
0x00002449, 0x00002db7, 0x00003999, 0x00004892, 0x0000016d, 0x000001cc, 0x00000244, 0x000002db,
0x00005b6f, 0x00007333, 0x00009124, 0x0000b6de, 0x00000399, 0x00000489, 0x000005b6, 0x00000733,
0x0000e666, 0x00012249, 0x00016dbc, 0x0001cccc, 0x00000912, 0x00000b6d, 0x00000e66, 0x00001224,
0x00024492, 0x0002db79, 0x00039999, 0x00048924, 0x000016db, 0x00001ccc, 0x00002449, 0x00002db7,
0x0005b6f2, 0x00073333, 0x00091249, 0x000b6de5, 0x00003999, 0x00004892, 0x00005b6f, 0x00007333,
0x000e6666, 0x00122492, 0x0016dbcb, 0x001ccccc, 0x00009124, 0x0000b6de, 0x0000e666, 0x00012249
}; };
static RK_U8 h264_aq_tthd_default[16] = { static RK_U8 h264_aq_tthd_default[16] = {
0, 0, 0, 0, 0, 0, 0, 2,
3, 3, 5, 5, 4, 4, 6, 6,
8, 8, 8, 15, 9, 9, 9, 15,
15, 20, 25, 35, 15, 20, 25, 35,
}; };
static RK_S8 h264_aq_step_default[16] = { static RK_S8 h264_P_aq_step_default[16] = {
-8, -7, -6, -5, -8, -7, -6, -12,
-4, -3, -2, -1, -9, -3, -2, -1,
0, 1, 2, 3, 0, 1, 2, 3,
4, 5, 7, 10, 4, 5, 7, 10,
}; };
static RK_S8 h264_I_aq_step_default[16] = {
-8, -7, -6, -12,
-9, -3, -2, -1,
0, 1, 2, 3,
4, 5, 6, 7,
};
static void setup_vepu541_l2(Vepu541H264eRegL2Set *regs, H264eSlice *slice) static void setup_vepu541_l2(Vepu541H264eRegL2Set *regs, H264eSlice *slice)
{ {
RK_U32 i; RK_U32 i;
@@ -1169,49 +1176,59 @@ static void setup_vepu541_l2(Vepu541H264eRegL2Set *regs, H264eSlice *slice)
regs->iprd_wgtc8[3] = 0x20; regs->iprd_wgtc8[3] = 0x20;
/* 000556ab */ /* 000556ab */
regs->qnt_bias_comb.qnt_bias_i = 683; regs->qnt_bias_comb.qnt_bias_i = 341;
regs->qnt_bias_comb.qnt_bias_p = 341; regs->qnt_bias_comb.qnt_bias_p = 171;
regs->atr_thd0_h264.atr_thd0 = 1; regs->atr_thd0_h264.atr_thd0 = 1;
regs->atr_thd0_h264.atr_thd1 = 4; regs->atr_thd0_h264.atr_thd1 = 4;
if (slice->slice_type == H264_I_SLICE) if (slice->slice_type == H264_I_SLICE) {
regs->atr_thd1_h264.atr_thd2 = 36; regs->atr_thd1_h264.atr_thd2 = 36;
else regs->atr_wgt16_h264.atr_lv16_wgt0 = 16;
regs->atr_wgt16_h264.atr_lv16_wgt1 = 16;
regs->atr_wgt16_h264.atr_lv16_wgt2 = 16;
regs->atr_wgt8_h264.atr_lv8_wgt0 = 32;
regs->atr_wgt8_h264.atr_lv8_wgt1 = 32;
regs->atr_wgt8_h264.atr_lv8_wgt2 = 32;
regs->atr_wgt4_h264.atr_lv4_wgt0 = 20;
regs->atr_wgt4_h264.atr_lv4_wgt1 = 18;
regs->atr_wgt4_h264.atr_lv4_wgt2 = 16;
} else {
regs->atr_thd1_h264.atr_thd2 = 49; regs->atr_thd1_h264.atr_thd2 = 49;
regs->atr_wgt16_h264.atr_lv16_wgt0 = 16;
regs->atr_wgt16_h264.atr_lv16_wgt1 = 16;
regs->atr_wgt16_h264.atr_lv16_wgt2 = 16;
regs->atr_wgt8_h264.atr_lv8_wgt0 = 16;
regs->atr_wgt8_h264.atr_lv8_wgt1 = 16;
regs->atr_wgt8_h264.atr_lv8_wgt2 = 16;
regs->atr_wgt4_h264.atr_lv4_wgt0 = 16;
regs->atr_wgt4_h264.atr_lv4_wgt1 = 16;
regs->atr_wgt4_h264.atr_lv4_wgt2 = 16;
}
regs->atr_thd1_h264.atr_qp = 45; regs->atr_thd1_h264.atr_qp = 45;
regs->atr_wgt16_h264.atr_lv16_wgt0 = 16;
regs->atr_wgt16_h264.atr_lv16_wgt1 = 16;
regs->atr_wgt16_h264.atr_lv16_wgt2 = 16;
regs->atr_wgt8_h264.atr_lv8_wgt0 = 32;
regs->atr_wgt8_h264.atr_lv8_wgt1 = 32;
regs->atr_wgt8_h264.atr_lv8_wgt2 = 32;
regs->atr_wgt4_h264.atr_lv4_wgt0 = 20;
regs->atr_wgt4_h264.atr_lv4_wgt1 = 18;
regs->atr_wgt4_h264.atr_lv4_wgt2 = 16;
regs->atf_tthd[0] = 0; regs->atf_tthd[0] = 0;
regs->atf_tthd[1] = 25; regs->atf_tthd[1] = 144;
regs->atf_tthd[2] = 100; regs->atf_tthd[2] = 576;
regs->atf_tthd[3] = 169; regs->atf_tthd[3] = 2500;
regs->atf_sthd0_h264.atf_sthd_10 = 30; regs->atf_sthd0_h264.atf_sthd_10 = 80;
regs->atf_sthd0_h264.atf_sthd_max = 60; regs->atf_sthd0_h264.atf_sthd_max = 300;
regs->atf_sthd1_h264.atf_sthd_11 = 40; regs->atf_sthd1_h264.atf_sthd_11 = 144;
regs->atf_sthd1_h264.atf_sthd_20 = 30; regs->atf_sthd1_h264.atf_sthd_20 = 192;
regs->atf_wgt0_h264.atf_wgt10 = 23; regs->atf_wgt0_h264.atf_wgt10 = 28;
regs->atf_wgt0_h264.atf_wgt11 = 22; regs->atf_wgt0_h264.atf_wgt11 = 26;
regs->atf_wgt1_h264.atf_wgt12 = 20; regs->atf_wgt1_h264.atf_wgt12 = 21;
regs->atf_wgt1_h264.atf_wgt20 = 20; regs->atf_wgt1_h264.atf_wgt20 = 25;
regs->atf_wgt2_h264.atf_wgt21 = 20; regs->atf_wgt2_h264.atf_wgt21 = 23;
regs->atf_wgt2_h264.atf_wgt30 = 22; regs->atf_wgt2_h264.atf_wgt30 = 22;
regs->atf_ofst0_h264.atf_ofst10 = 3500; regs->atf_ofst0_h264.atf_ofst10 = 3500;
@@ -1234,14 +1251,19 @@ static void setup_vepu541_l2(Vepu541H264eRegL2Set *regs, H264eSlice *slice)
memcpy(regs->aq_tthd, h264_aq_tthd_default, sizeof(regs->aq_tthd)); memcpy(regs->aq_tthd, h264_aq_tthd_default, sizeof(regs->aq_tthd));
for (i = 0; i < MPP_ARRAY_ELEMS(regs->aq_step); i++) if (slice->slice_type == H264_I_SLICE) {
regs->aq_step[i] = h264_aq_step_default[i] & 0x3f; for (i = 0; i < MPP_ARRAY_ELEMS(regs->aq_step); i++)
regs->aq_step[i] = h264_I_aq_step_default[i] & 0x3f;
} else {
for (i = 0; i < MPP_ARRAY_ELEMS(regs->aq_step); i++)
regs->aq_step[i] = h264_P_aq_step_default[i] & 0x3f;
}
regs->rme_mvd_penalty.mvd_pnlt_e = 0; regs->rme_mvd_penalty.mvd_pnlt_e = 1;
regs->rme_mvd_penalty.mvd_pnlt_coef = 16; regs->rme_mvd_penalty.mvd_pnlt_coef = 1;
regs->rme_mvd_penalty.mvd_pnlt_cnst = 1024; regs->rme_mvd_penalty.mvd_pnlt_cnst = 16000;
regs->rme_mvd_penalty.mvd_pnlt_lthd = 12; regs->rme_mvd_penalty.mvd_pnlt_lthd = 0;
regs->rme_mvd_penalty.mvd_pnlt_hthd = 12; regs->rme_mvd_penalty.mvd_pnlt_hthd = 0;
regs->atr1_thd0_h264.atr1_thd0 = 1; regs->atr1_thd0_h264.atr1_thd0 = 1;
regs->atr1_thd0_h264.atr1_thd1 = 4; regs->atr1_thd0_h264.atr1_thd1 = 4;