From 457b5c9fa9e491be63104461c2c5d8908df373f5 Mon Sep 17 00:00:00 2001 From: zywang Date: Mon, 26 Oct 2020 18:45:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/analyze.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/analyze.c b/src/analyze.c index 301aefd..31d6050 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -1521,28 +1521,28 @@ static double mode_coding_tree(core_t *core, lbac_t *lbac_cur, int x0, int y0, i for (int split_mode_num = 1; split_mode_num < NUM_SPLIT_MODE; ++split_mode_num) { split_mode_t split_mode = split_mode_order[split_mode_num]; int is_mode_EQT = com_split_is_EQT(split_mode); - int skip_cur_splite = is_mode_EQT ? (best_split_mode != NO_SPLIT || cost_best > MAX_D_COST_EXT) : 1; + int enable_cur_split = is_mode_EQT ? (best_split_mode != NO_SPLIT || cost_best > MAX_D_COST_EXT) : 1; if (info->depth_rm_splite_by_border) { - if (split_mode == SPLIT_EQT_HOR && skip_cur_splite && split_allow[SPLIT_EQT_HOR] && cu_width_log2 + cu_height_log2 >= 11) { + if (split_mode == SPLIT_EQT_HOR && enable_cur_split && split_allow[SPLIT_EQT_HOR] && cu_width_log2 + cu_height_log2 >= 11) { if (score_from_bth[SPLIT_EQT_HOR] + score_from_btv[SPLIT_EQT_HOR] + score_from_qt[SPLIT_EQT_HOR] < 0) { - skip_cur_splite = 0; + enable_cur_split = 0; } } - if (split_mode == SPLIT_EQT_VER && skip_cur_splite && split_allow[SPLIT_EQT_VER] && cu_width_log2 + cu_height_log2 >= 11) { + if (split_mode == SPLIT_EQT_VER && enable_cur_split && split_allow[SPLIT_EQT_VER] && cu_width_log2 + cu_height_log2 >= 11) { if (score_from_bth[SPLIT_EQT_VER] + score_from_btv[SPLIT_EQT_VER] + score_from_qt[SPLIT_EQT_VER] < 0) { - skip_cur_splite = 0; + enable_cur_split = 0; } } if (split_mode_num == 3 && split_mode == SPLIT_BI_HOR && score_from_btv[SPLIT_BI_HOR] < 0 && cu_width_log2 + cu_height_log2 >= 11) { - skip_cur_splite = 0; + enable_cur_split = 0; } if (split_mode_num == 3 && split_mode == SPLIT_BI_VER && score_from_bth[SPLIT_BI_VER] < 0 && cu_width_log2 + cu_height_log2 >= 11) { - skip_cur_splite = 0; + enable_cur_split = 0; } } - if (split_allow[split_mode] && skip_cur_splite) { + if (split_allow[split_mode] && enable_cur_split) { double best_cons_cost = MAX_D_COST; com_split_struct_t split_struct; u8 tree_status_child = TREE_LC;