commit 7fcfee4080349d54f82af0fb3033ab181c154f6a
author Angie Chiang <angiebird@google.com> Fri Feb 24 15:51:03 2017 -0800
committer Angie Chiang <angiebird@google.com> Mon Feb 27 18:19:41 2017 +0000
tree 05a24c2a8b073d25ddf82c6e280910bc65510e69
parent 345a22db54d54693da80b912d2e9b233232e6d16

Prefer using get_tx_size()

Change-Id: Ifcdd3ce2953c1ecb1d0962da412a4b5ba2cda912

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 9daa6c9..f721df0 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1126,8 +1126,7 @@
 
 #if !CONFIG_VAR_TX && !CONFIG_SUPERTX
   // Check for consistency of tx_size with mode info
-  assert(type == PLANE_TYPE_Y ? mbmi->tx_size == tx_size
-                              : get_uv_tx_size(mbmi, pd) == tx_size);
+  assert(tx_size == get_tx_size(plane, xd));
 #endif  // !CONFIG_VAR_TX && !CONFIG_SUPERTX
   (void)cm;