commit 8149226710a2b3fa70577d717e806171177a9158
author Jingning Han <jingning@google.com> Mon Dec 05 15:48:47 2016 -0800
committer Jingning Han <jingning@google.com> Tue Dec 06 01:45:09 2016 +0000
tree 3301819d02ff74b397aec51b7c3e0fb965cb0ae1
parent 0d1be88ea80b6a0ac7dc0dc0a9ee9128d672ef0c

Handle the block offset using min transform block size

Map the block offset to pixel positions in the unit of minimum
transform block size. This change retains the same coding
statistics. The encoding speed is slightly faster (<1%).

Change-Id: I2641d2b1e317ef4cdf477718c446ef025b8eef41

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 69dc233..941f465 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1208,9 +1208,13 @@
       const int dst_stride = pd->dst.stride;
       const int diff_stride = block_size_wide[plane_bsize];
 
-      const uint8_t *src = &p->src.buf[4 * (blk_row * src_stride + blk_col)];
-      const uint8_t *dst = &pd->dst.buf[4 * (blk_row * dst_stride + blk_col)];
-      const int16_t *diff = &p->src_diff[4 * (blk_row * diff_stride + blk_col)];
+      const uint8_t *src =
+          &p->src.buf[(blk_row * src_stride + blk_col) << tx_size_wide_log2[0]];
+      const uint8_t *dst =
+          &pd->dst
+               .buf[(blk_row * dst_stride + blk_col) << tx_size_wide_log2[0]];
+      const int16_t *diff = &p->src_diff[(blk_row * diff_stride + blk_col)
+                                         << tx_size_wide_log2[0]];
 
       unsigned int tmp;
       this_rd_stats.sse = sum_squares_2d(diff, diff_stride, tx_size);