From: Dmitry Kovalev <dkovalev@google.com>
Date: Tue, 6 Aug 2013 17:30:37 +0000 (-0700)
Subject: Merge "Finally removing all old block size constants."
X-Git-Tag: v1.3.0~667
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e51acafec730e118edc2660a8c0a94f04c327e8;p=libvpx

Merge "Finally removing all old block size constants."
---

3e51acafec730e118edc2660a8c0a94f04c327e8
diff --cc vp9/encoder/vp9_encodeframe.c
index 1be30ea6b,4b74bc836..8bd35008f
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -1923,11 -1922,10 +1923,11 @@@ static void encode_sb_row(VP9_COMP *cpi
        MODE_INFO *m = cm->mi + idx_str;
        MODE_INFO *p = cm->prev_mi + idx_str;
  
 +      cpi->mb.source_variance = UINT_MAX;
        if (cpi->sf.use_one_partition_size_always) {
-         set_offsets(cpi, mi_row, mi_col, BLOCK_SIZE_SB64X64);
+         set_offsets(cpi, mi_row, mi_col, BLOCK_64X64);
          set_partitioning(cpi, m, cpi->sf.always_this_block_size);
-         rd_use_partition(cpi, m, tp, mi_row, mi_col, BLOCK_SIZE_SB64X64,
+         rd_use_partition(cpi, m, tp, mi_row, mi_col, BLOCK_64X64,
                           &dummy_rate, &dummy_dist, 1);
        } else if (cpi->sf.partition_by_variance) {
          choose_partitioning(cpi, cm->mi, mi_row, mi_col);