commit 4c6d4369aa82e1b5f8e8acb87199c99e35a7b461
author Urvang Joshi <urvang@google.com> Thu May 11 12:35:46 2017 -0700
committer Urvang Joshi <urvang@google.com> Thu May 11 21:56:34 2017 +0000
tree 25430ec0a1b896b69f9e1c30158704142cc074aa
parent a9bd85f7097804f4368c69ebaee707aa9234f219

Handle tx64x64 correctly in get_entropy_contexts.

This unhandled case was causing an assertion failure.

BUG=aomedia:532

Change-Id: I46665c380ad171e2b9ddf4d41b6e9fff838f8b3e

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index cffa26b..81eee8a 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -593,6 +593,20 @@
         t_left[i] =
             !!(*(const uint64_t *)&left[i] | *(const uint64_t *)&left[i + 8]);
       break;
+#if CONFIG_TX64X64
+    case TX_64X64:
+      for (i = 0; i < num_4x4_w; i += 32)
+        t_above[i] =
+            !!(*(const uint64_t *)&above[i] | *(const uint64_t *)&above[i + 8] |
+               *(const uint64_t *)&above[i + 16] |
+               *(const uint64_t *)&above[i + 24]);
+      for (i = 0; i < num_4x4_h; i += 32)
+        t_left[i] =
+            !!(*(const uint64_t *)&left[i] | *(const uint64_t *)&left[i + 8] |
+               *(const uint64_t *)&left[i + 16] |
+               *(const uint64_t *)&left[i + 24]);
+      break;
+#endif  // CONFIG_TX64X64
     case TX_4X8:
       for (i = 0; i < num_4x4_w; i += 2)
         t_above[i] = !!*(const uint16_t *)&above[i];