Revert "vp9: Change the scheme for modeling rd for bsize 32x32."
This reverts commit 5c29ee726e.
Causes segfaults in VP9/EndToEndTestLarge.EndtoEndPSNRTest.
BUG=webm:1250
Change-Id: I8a30e97be30589abdb76820b5c3c37c46cd6cafb
This commit is contained in:
@@ -1727,7 +1727,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
|
|||||||
vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize);
|
vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize);
|
||||||
|
|
||||||
// For large partition blocks, extra testing is done.
|
// 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) &&
|
!cyclic_refresh_segment_id_boosted(xd->mi[0]->segment_id) &&
|
||||||
cm->base_qindex) {
|
cm->base_qindex) {
|
||||||
model_rd_for_sb_y_large(cpi, bsize, x, xd, &this_rdc.rate,
|
model_rd_for_sb_y_large(cpi, bsize, x, xd, &this_rdc.rate,
|
||||||
|
|||||||
Reference in New Issue
Block a user