shithub: libvpx

Info  •  Files  •  Log  •  Branches

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

This reverts commit 5c29ee726e622baf6f950dfe980df0d4c116c1a8.

Causes segfaults in VP9/EndToEndTestLarge.EndtoEndPSNRTest.

BUG=webm:1250

Change-Id: I8a30e97be30589abdb76820b5c3c37c46cd6cafb

--- 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,