shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Change the scheme for modeling rd for bsize 32x32."

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1727,9 +1727,9 @@

       vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize);

       // For large partition blocks, extra testing is done.

-      if (cpi->oxcf.rc_mode == VPX_CBR && bsize > BLOCK_32X32 &&

-        !cyclic_refresh_segment_id_boosted(xd->mi[0]->segment_id) &&

-        cm->base_qindex) {

+      if (cpi->oxcf.rc_mode == VPX_CBR && bsize >= BLOCK_32X32 &&

+          !cyclic_refresh_segment_id_boosted(xd->mi[0]->segment_id) &&

+          cm->base_qindex) {

         model_rd_for_sb_y_large(cpi, bsize, x, xd, &this_rdc.rate,

                                 &this_rdc.dist, &var_y, &sse_y, mi_row, mi_col,

                                 &this_early_term);