commit 64e8537ec5aedf66b8c1e48876f95cd51a62cfd1
author Tom Finegan <tomfinegan@google.com> Mon Feb 06 13:53:43 2017 -0800
committer Tom Finegan <tomfinegan@google.com> Mon Feb 13 10:14:00 2017 -0800
tree 337fd6d60ae6590449af1fefa132380749fe24ea
parent e0abcb82f1f68377a9419a2e9018822745f05cf4

Add CONFIG_ANS support to the cmake build.

BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=76

Change-Id: I917896f377ce16bc7035311c3ecc2a6a3414b93c

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53cc2ec..262ed44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -491,9 +491,6 @@
     "${AOM_ROOT}/test/active_map_test.cc"
     "${AOM_ROOT}/test/altref_test.cc"
     "${AOM_ROOT}/test/android"
-    # requires CONFIG_ANS
-    #"${AOM_ROOT}/test/ans_codec_test.cc"
-    #"${AOM_ROOT}/test/ans_test.cc"
     "${AOM_ROOT}/test/aq_segment_test.cc"
     "${AOM_ROOT}/test/arf_freq_test.cc"
     "${AOM_ROOT}/test/av1_convolve_optimz_test.cc"
@@ -537,7 +534,6 @@
     "${AOM_ROOT}/test/encode_api_test.cc"
     "${AOM_ROOT}/test/encode_test_driver.cc"
     "${AOM_ROOT}/test/encode_test_driver.h"
-    "${AOM_ROOT}/test/encoder_parms_get_to_decoder.cc"
     "${AOM_ROOT}/test/end_to_end_test.cc"
     "${AOM_ROOT}/test/error_block_test.cc"
     "${AOM_ROOT}/test/error_resilience_test.cc"
@@ -610,6 +606,26 @@
       "${AOM_ROOT}/test/accounting_test.cc")
 endif ()
 
+if (CONFIG_ANS)
+  if (CONFIG_DAALA_EC)
+    message(FATAL_ERROR "CONFIG_ANS requires CONFIG_DAALA_EC=0.")
+  endif ()
+
+  set(AOM_DSP_SOURCES
+      ${AOM_DSP_SOURCES}
+      "${AOM_ROOT}/aom_dsp/ans.h"
+      "${AOM_ROOT}/aom_dsp/ansreader.h"
+      "${AOM_ROOT}/aom_dsp/answriter.h"
+      "${AOM_ROOT}/aom_dsp/buf_ans.c"
+      "${AOM_ROOT}/aom_dsp/buf_ans.h")
+
+  set(AOM_UNIT_TEST_SOURCES
+      ${AOM_UNIT_TEST_SOURCES}
+      "${AOM_ROOT}/test/ans_codec_test.cc"
+      "${AOM_ROOT}/test/ans_test.cc")
+  list(REMOVE_ITEM AOM_UNIT_TEST_SOURCES "${AOM_ROOT}/test/boolcoder_test.cc")
+endif ()
+
 if (CONFIG_CLPF)
   set(AOM_AV1_COMMON_SOURCES
       ${AOM_AV1_COMMON_SOURCES}