shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Replace the call to set_offsets()"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -1463,6 +1463,8 @@

   int r, c;

   MODE_INFO *mi_upper_left = cm->mi + mi_row * mis + mi_col;

+  vp9_setup_src_planes(x, cpi->Source, mi_row, mi_col);

+

   assert((row8x8_remaining > 0) && (col8x8_remaining > 0));

   // In-image SB64

@@ -3193,7 +3195,6 @@

                             1, &dummy_rate, &dummy_dist);

         break;

       case SOURCE_VAR_BASED_PARTITION:

-        set_offsets(cpi, tile, mi_row, mi_col, BLOCK_64X64);

         set_source_var_based_partition(cpi, tile, mi_8x8, mi_row, mi_col);

         nonrd_use_partition(cpi, tile, mi_8x8, tp, mi_row, mi_col, BLOCK_64X64,

                             1, &dummy_rate, &dummy_dist);