commit 2db97f3ac414ce8377d71c092d17685a6e83bb89
author Steinar Midtskogen <stemidts@cisco.com> Tue Mar 06 14:31:19 2018 +0100
committer Steinar Midtskogen <stemidts@cisco.com> Wed Mar 07 07:55:51 2018 +0000
tree bb1195925ad1813c47f8f9aa8e2d1b39c0963611
parent 6083e0181a9e39881b05db070e87bc72aff463bc

Clean up read_cdef()

Should make the code slightly easier to follow, and the code should
compile to exactly the same.

Change-Id: Ia097c8b8b7cb129be4a956a8779b7c132772c6bf

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index d921b41..a8a5f1e 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -44,14 +44,14 @@
     return;
   }
 
-  const int m = ~((1 << (6 - MI_SIZE_LOG2)) - 1);
   if (!(mi_col & (cm->seq_params.mib_size - 1)) &&
       !(mi_row & (cm->seq_params.mib_size - 1))) {  // Top left?
     cm->cdef_preset[0] = cm->cdef_preset[1] = cm->cdef_preset[2] =
         cm->cdef_preset[3] = -1;
   }
-  // Read CDEF param at first a non-skip coding block
-  const int mask = 1 << (6 - MI_SIZE_LOG2);
+  // Read CDEF param at the first non-skip coding block
+  const int mask = (1 << (6 - MI_SIZE_LOG2));
+  const int m = ~(mask - 1);
   const int index = cm->seq_params.sb_size == BLOCK_128X128
                         ? !!(mi_col & mask) + 2 * !!(mi_row & mask)
                         : 0;