commit c598cf853f8fb36520a5461ba35f812f45662ecd
author Jingning Han <jingning@google.com> Tue Oct 25 10:37:34 2016 -0700
committer Jingning Han <jingning@google.com> Tue Oct 25 10:47:46 2016 -0700
tree 82661820c8ac152ccaf750c25604cba370e0b570
parent b9c572706d11720ddb0f2478165f7508e9096956

Use table fetch for block width in block_rd_txfm

Make direct use of block_size_wide to fetch data for stride.

Change-Id: I0d8491e58cf00ea73c764d218cb56408b64d9ee7

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 01af603..9538d71 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1112,8 +1112,7 @@
 #endif  // CONFIG_EXT_TX
     default:
       assert(tx_size < TX_SIZES);
-      sse = aom_sum_squares_2d_i16(
-          diff, diff_stride, num_4x4_blocks_wide_txsize_lookup[tx_size] << 2);
+      sse = aom_sum_squares_2d_i16(diff, diff_stride, tx_size_wide[tx_size]);
       break;
   }
   return sse;
@@ -1157,7 +1156,7 @@
 
       const int src_stride = p->src.stride;
       const int dst_stride = pd->dst.stride;
-      const int diff_stride = 4 * num_4x4_blocks_wide_lookup[plane_bsize];
+      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)];