From 59d45d603b569c61ccd6f8c7e0dad1438333eb18 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Mon, 28 Mar 2016 11:52:11 -0700 Subject: [PATCH] Rename run_rd_check to run_mv_search Improve the readability in the related rate-distortion optimization search control function of sub8x8 blocks. Change-Id: I7f7456bf40a98aa5146abfe0488cda745b84d899 --- vp10/encoder/rdopt.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c index b73e05db0..4616371f6 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c @@ -4921,7 +4921,9 @@ static int64_t rd_pick_best_sub8x8_mode(VP10_COMP *cpi, MACROBLOCK *x, #endif // CONFIG_EXT_INTER const struct buf_2d orig_src = x->plane[0].src; struct buf_2d orig_pre[2]; - int run_rd_check = 0; + // This flag controls if the motion estimation will kick off. When it + // is set to a non-zero value, the encoder will force motion estimation. + int run_mv_search = 0; mode_idx = INTER_OFFSET(this_mode); #if CONFIG_EXT_INTER @@ -4935,7 +4937,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP10_COMP *cpi, MACROBLOCK *x, continue; #if CONFIG_REF_MV - run_rd_check = 2; + run_mv_search = 2; #if !CONFIG_EXT_INTER if (filter_idx > 0) { BEST_SEG_INFO* ref_bsi = bsi_buf; @@ -4944,39 +4946,39 @@ static int64_t rd_pick_best_sub8x8_mode(VP10_COMP *cpi, MACROBLOCK *x, ref_bsi->rdstat[i][mode_idx].mvs[0].as_int != INVALID_MV) if (bsi->ref_mv[0]->as_int == ref_bsi->rdstat[i][mode_idx].pred_mv[0].as_int) - --run_rd_check; + --run_mv_search; if (!has_second_rf) { - --run_rd_check; + --run_mv_search; } else { if (seg_mvs[i][mbmi->ref_frame[1]].as_int == ref_bsi->rdstat[i][mode_idx].mvs[1].as_int && ref_bsi->rdstat[i][mode_idx].mvs[1].as_int != INVALID_MV) if (bsi->ref_mv[1]->as_int == ref_bsi->rdstat[i][mode_idx].pred_mv[1].as_int) - --run_rd_check; + --run_mv_search; } - if (run_rd_check != 0 && filter_idx > 1) { + if (run_mv_search != 0 && filter_idx > 1) { ref_bsi = bsi_buf + 1; - run_rd_check = 2; + run_mv_search = 2; if (seg_mvs[i][mbmi->ref_frame[0]].as_int == ref_bsi->rdstat[i][mode_idx].mvs[0].as_int && ref_bsi->rdstat[i][mode_idx].mvs[0].as_int != INVALID_MV) if (bsi->ref_mv[0]->as_int == ref_bsi->rdstat[i][mode_idx].pred_mv[0].as_int) - --run_rd_check; + --run_mv_search; if (!has_second_rf) { - --run_rd_check; + --run_mv_search; } else { if (seg_mvs[i][mbmi->ref_frame[1]].as_int == ref_bsi->rdstat[i][mode_idx].mvs[1].as_int && ref_bsi->rdstat[i][mode_idx].mvs[1].as_int != INVALID_MV) if (bsi->ref_mv[1]->as_int == ref_bsi->rdstat[i][mode_idx].pred_mv[1].as_int) - --run_rd_check; + --run_mv_search; } } } @@ -5005,7 +5007,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP10_COMP *cpi, MACROBLOCK *x, #else this_mode == NEWMV && (seg_mvs[i][mbmi->ref_frame[0]].as_int == INVALID_MV || - run_rd_check) + run_mv_search) #endif // CONFIG_EXT_INTER ) { #if CONFIG_EXT_INTER @@ -5169,7 +5171,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP10_COMP *cpi, MACROBLOCK *x, #else this_mode == NEWMV && #endif // CONFIG_EXT_INTER - (mbmi->interp_filter == EIGHTTAP_REGULAR || run_rd_check)) { + (mbmi->interp_filter == EIGHTTAP_REGULAR || run_mv_search)) { // adjust src pointers mi_buf_shift(x, i); if (cpi->sf.comp_inter_joint_search_thresh <= bsize) { -- 2.40.0