commit ae9ec67d30e99f1bcb7023838503989319f2d70c
author Hui Su <huisu@google.com> Thu Jan 11 16:32:19 2018 -0800
committer Fred BARBIER <frederic.barbier@allegrodvt.com> Fri Jan 12 13:22:59 2018 +0000
tree 457c341e838c42f14b158b2a79760a249e455b22
parent fbb75a999caf56b2092e5e0c5f61100381e82a99

Code simplification

Change-Id: I2a9e16bf337a91219fc2aa10937d3cd1dfa67a71

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 6a092e6..f6b1a91 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3953,8 +3953,8 @@
   if (is_cost_valid) {
     const struct macroblockd_plane *const pd = &xd->plane[0];
     const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);
-    const int mi_width = block_size_wide[plane_bsize] >> tx_size_wide_log2[0];
-    const int mi_height = block_size_high[plane_bsize] >> tx_size_high_log2[0];
+    const int mi_width = mi_size_wide[plane_bsize];
+    const int mi_height = mi_size_high[plane_bsize];
     const TX_SIZE max_tx_size = get_max_rect_tx_size(plane_bsize, 1);
     const int bh = tx_size_high_unit[max_tx_size];
     const int bw = tx_size_wide_unit[max_tx_size];
@@ -4201,8 +4201,8 @@
   if (is_cost_valid) {
     const struct macroblockd_plane *const pd = &xd->plane[0];
     const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);
-    const int mi_width = block_size_wide[plane_bsize] >> tx_size_wide_log2[0];
-    const int mi_height = block_size_high[plane_bsize] >> tx_size_high_log2[0];
+    const int mi_width = mi_size_wide[plane_bsize];
+    const int mi_height = mi_size_high[plane_bsize];
     const TX_SIZE max_tx_size = get_vartx_max_txsize(
         xd, plane_bsize, pd->subsampling_x || pd->subsampling_y);
     const int bh = tx_size_high_unit[max_tx_size];