commit 80f74b0ae443e348ee31f0f7c432cacdf88dcadd
author Jingning Han <jingning@google.com> Tue May 09 09:19:46 2017 -0700
committer Jingning Han <jingning@google.com> Wed May 10 16:23:45 2017 +0000
tree d47b12d6abcb650ed2505eec8c3054c06413edb8
parent 23e4e7b6790c4ea71770dc17fae4ac20aaecc2ce

Simplify logic in write_modes_sb

Remove redundant #if statements and condition checks.

Change-Id: Ic7885564f21730ca67279202a9bcd51f45a04414

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 828cad8..a41ed49 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2975,21 +2975,11 @@
 #endif  // CONFIG_EXT_PARTITION_TYPES
 
 #if CONFIG_CDEF
-#if CONFIG_EXT_PARTITION
-  if (cm->sb_size == BLOCK_128X128 && bsize == BLOCK_128X128 &&
-      !sb_all_skip(cm, mi_row, mi_col)) {
+  if (bsize == cm->sb_size && !sb_all_skip(cm, mi_row, mi_col) &&
+      cm->cdef_bits != 0) {
     aom_write_literal(w, cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]
                              ->mbmi.cdef_strength,
                       cm->cdef_bits);
-  } else if (cm->sb_size == BLOCK_64X64 && bsize == BLOCK_64X64 &&
-#else
-  if (bsize == BLOCK_64X64 &&
-#endif  // CONFIG_EXT_PARTITION
-             !sb_all_skip(cm, mi_row, mi_col)) {
-    if (cm->cdef_bits != 0)
-      aom_write_literal(w, cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col]
-                               ->mbmi.cdef_strength,
-                        cm->cdef_bits);
   }
 #endif
 }