diff options
author | Jerome Jiang <jianj@google.com> | 2019-04-17 13:39:18 -0700 |
---|---|---|
committer | Jerome Jiang <jianj@google.com> | 2019-04-18 18:09:30 -0700 |
commit | 82b8a251943375d24e1ac242162f76360d4ef646 (patch) | |
tree | f0932fa41ea60e7d3657f38973c3c02cab16b1ee /vp9/encoder/vp9_pickmode.c | |
parent | e718cade1dc7179daede6b695166702dbf6ab8b4 (diff) | |
download | libvpx-82b8a251943375d24e1ac242162f76360d4ef646.tar libvpx-82b8a251943375d24e1ac242162f76360d4ef646.tar.gz libvpx-82b8a251943375d24e1ac242162f76360d4ef646.tar.bz2 libvpx-82b8a251943375d24e1ac242162f76360d4ef646.zip |
vp9: Use model rd for large blocks in filter search.
Neutral on speed and quality.
Change-Id: Ia1d3929124bb57e31bbab516a994734d2fd51891
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
-rw-r--r-- | vp9/encoder/vp9_pickmode.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 38b00dec3..00de100df 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1436,7 +1436,9 @@ static void search_filter_ref(VP9_COMP *cpi, MACROBLOCK *x, RD_COST *this_rdc, int mi_row, int mi_col, PRED_BUFFER *tmp, BLOCK_SIZE bsize, int reuse_inter_pred, PRED_BUFFER **this_mode_pred, unsigned int *var_y, - unsigned int *sse_y, int force_smooth_filter) { + unsigned int *sse_y, int force_smooth_filter, + int *this_early_term, int *flag_preduv_computed, + int use_model_yrd_large) { MACROBLOCKD *const xd = &x->e_mbd; MODE_INFO *const mi = xd->mi[0]; struct macroblockd_plane *const pd = &xd->plane[0]; @@ -1452,13 +1454,22 @@ static void search_filter_ref(VP9_COMP *cpi, MACROBLOCK *x, RD_COST *this_rdc, INTERP_FILTER best_filter = SWITCHABLE, filter; PRED_BUFFER *current_pred = *this_mode_pred; uint8_t skip_txfm = SKIP_TXFM_NONE; + int best_early_term = 0; + int best_flag_preduv_computed[2] = { 0 }; INTERP_FILTER filter_start = force_smooth_filter ? EIGHTTAP_SMOOTH : EIGHTTAP; for (filter = filter_start; filter <= EIGHTTAP_SMOOTH; ++filter) { int64_t cost; mi->interp_filter = filter; vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize); - model_rd_for_sb_y(cpi, bsize, x, xd, &pf_rate[filter], &pf_dist[filter], - &pf_var[filter], &pf_sse[filter]); + // For large partition blocks, extra testing is done. + if (use_model_yrd_large) + model_rd_for_sb_y_large(cpi, bsize, x, xd, &pf_rate[filter], + &pf_dist[filter], &pf_var[filter], + &pf_sse[filter], mi_row, mi_col, this_early_term, + flag_preduv_computed); + else + model_rd_for_sb_y(cpi, bsize, x, xd, &pf_rate[filter], &pf_dist[filter], + &pf_var[filter], &pf_sse[filter]); curr_rate[filter] = pf_rate[filter]; pf_rate[filter] += vp9_get_switchable_rate(cpi, xd); cost = RDCOST(x->rdmult, x->rddiv, pf_rate[filter], pf_dist[filter]); @@ -1467,6 +1478,9 @@ static void search_filter_ref(VP9_COMP *cpi, MACROBLOCK *x, RD_COST *this_rdc, best_filter = filter; best_cost = cost; skip_txfm = x->skip_txfm[0]; + best_early_term = *this_early_term; + best_flag_preduv_computed[0] = flag_preduv_computed[0]; + best_flag_preduv_computed[1] = flag_preduv_computed[1]; if (reuse_inter_pred) { if (*this_mode_pred != current_pred) { @@ -1490,6 +1504,9 @@ static void search_filter_ref(VP9_COMP *cpi, MACROBLOCK *x, RD_COST *this_rdc, *var_y = pf_var[best_filter]; *sse_y = pf_sse[best_filter]; x->skip_txfm[0] = skip_txfm; + *this_early_term = best_early_term; + flag_preduv_computed[0] = best_flag_preduv_computed[0]; + flag_preduv_computed[1] = best_flag_preduv_computed[1]; if (reuse_inter_pred) { pd->dst.buf = (*this_mode_pred)->data; pd->dst.stride = (*this_mode_pred)->stride; @@ -2237,7 +2254,8 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data, rd_computed = 1; search_filter_ref(cpi, x, &this_rdc, mi_row, mi_col, tmp, bsize, reuse_inter_pred, &this_mode_pred, &var_y, &sse_y, - force_smooth_filter); + force_smooth_filter, &this_early_term, + flag_preduv_computed, use_model_yrd_large); } else { mi->interp_filter = (filter_ref == SWITCHABLE) ? EIGHTTAP : filter_ref; |