commit 1640bfd4bfda17d17aef0849c8011de92e2d315d
author Angie Chiang <angiebird@google.com> Fri Dec 15 17:06:15 2017 -0800
committer Yaowu Xu <yaowu@google.com> Mon Dec 18 02:19:30 2017 +0000
tree 4dfb066af98a8ec9b477520e810ec3cc1abc3f08
parent 4b847e19facea9bd973cf8327b06d0e491bdb908

Fix assertion of txk_type check

Change-Id: I6db5563ec4f4992a899090cf15c3f5f5125a0764

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index bc26cfc..f8057eb 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -668,7 +668,7 @@
     xd->mi[0]->mbmi.txk_type[(blk_row << MAX_MIB_SIZE_LOG2) + blk_col] =
         DCT_DCT;
 #else
-    assert(xd->mi[0]->mbmi.txk_type[blk_row << MAX_MIB_SIZE_LOG2 + blk_col] ==
+    assert(xd->mi[0]->mbmi.txk_type[(blk_row << MAX_MIB_SIZE_LOG2) + blk_col] ==
            DCT_DCT);
 #endif
   }
@@ -954,8 +954,9 @@
       xd->mi[0]->mbmi.txk_type[(blk_row << MAX_MIB_SIZE_LOG2) + blk_col] =
           DCT_DCT;
 #else
-      assert(xd->mi[0]->mbmi.txk_type[blk_row << MAX_MIB_SIZE_LOG2 + blk_col] ==
-             DCT_DCT);
+      assert(
+          xd->mi[0]->mbmi.txk_type[(blk_row << MAX_MIB_SIZE_LOG2) + blk_col] ==
+          DCT_DCT);
 #endif
     }
 #endif  // CONFIG_TXK_SEL