ref: 7ed1d54ab4b75037e90c46135cfe01b7dc47fa4d
parent: 26daa30da4eae7a50e7418c87aa48a2306b56a54
parent: d4596485bec6d82d5949ae53af07196edb819e2a
author: Yaowu Xu <[email protected]>
date: Fri Jun 24 12:05:54 EDT 2016
Merge "Revert "vp9: Change the scheme for modeling rd for bsize 32x32.""
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1727,7 +1727,7 @@
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 &&
+ 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,