commit af61acf8f7cbec9fa1f6e76e71b8439be7cfb43f
author James Zern <jzern@google.com> Mon Feb 26 20:38:57 2018 -0800
committer James Zern <jzern@google.com> Mon Feb 26 20:38:57 2018 -0800
tree 69876fbfb4bfd7fb820c513ba956dde67d4acedb
parent 3df52f86420bf60944927a782a217af7b6450212

remove remaining CONFIG_INTRABC references

fixes some -Wundef warnings since:
293f281f5 Remove intrabc experiment flag

Change-Id: I7c6edc74b6d52b108eef6e0fa88ba16376556091

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index ec40bc0..5a2b952 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -42,12 +42,10 @@
 static void read_cdef(AV1_COMMON *cm, aom_reader *r, MB_MODE_INFO *const mbmi,
                       int mi_col, int mi_row) {
   if (cm->all_lossless) return;
-#if CONFIG_INTRABC
   if (cm->allow_intrabc && NO_FILTER_FOR_IBC) {
     assert(cm->cdef_bits == 0);
     return;
   }
-#endif  // CONFIG_INTRABC
 
   const int m = ~((1 << (6 - MI_SIZE_LOG2)) - 1);
   if (!(mi_col & (cm->seq_params.mib_size - 1)) &&

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 4cbcbe8..e900575 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -954,12 +954,10 @@
 static void write_cdef(AV1_COMMON *cm, aom_writer *w, int skip, int mi_col,
                        int mi_row) {
   if (cm->all_lossless) return;
-#if CONFIG_INTRABC
   if (cm->allow_intrabc && NO_FILTER_FOR_IBC) {
     assert(cm->cdef_bits == 0);
     return;
   }
-#endif  // CONFIG_INTRABC
 
   const int m = ~((1 << (6 - MI_SIZE_LOG2)) - 1);
   const MB_MODE_INFO *mbmi =

test/test.cmake

diff --git a/test/test.cmake b/test/test.cmake
index 315638f..52a2857 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -130,26 +130,18 @@
         ${AOM_UNIT_TEST_COMMON_SOURCES}
         "${AOM_ROOT}/test/av1_convolve_optimz_test.cc"
         "${AOM_ROOT}/test/av1_convolve_test.cc"
+        "${AOM_ROOT}/test/cdef_test.cc"
+        "${AOM_ROOT}/test/intrabc_test.cc"
         "${AOM_ROOT}/test/intrapred_test.cc"
         "${AOM_ROOT}/test/lpf_test.cc"
-        "${AOM_ROOT}/test/scan_test.cc"
         "${AOM_ROOT}/test/onyxc_int_test.cc"
+        "${AOM_ROOT}/test/scan_test.cc"
         "${AOM_ROOT}/test/simd_cmp_impl.h")
 
     set(AOM_UNIT_TEST_ENCODER_SOURCES
         ${AOM_UNIT_TEST_ENCODER_SOURCES}
         "${AOM_ROOT}/test/motion_vector_test.cc")
 
-    set(AOM_UNIT_TEST_COMMON_SOURCES
-        ${AOM_UNIT_TEST_COMMON_SOURCES}
-        "${AOM_ROOT}/test/cdef_test.cc")
-
-    if (CONFIG_INTRABC)
-        set(AOM_UNIT_TEST_COMMON_SOURCES
-            ${AOM_UNIT_TEST_COMMON_SOURCES}
-            "${AOM_ROOT}/test/intrabc_test.cc")
-    endif ()
-
     if (CONFIG_FILTER_INTRA)
       if (HAVE_SSE4_1)
         set(AOM_UNIT_TEST_COMMON_SOURCES