commit b9553313389c8cb34ea28b11619bc428787ca21f
author Jerome Jiang <jianj@google.com> Fri Sep 20 15:38:27 2019 -0700
committer Jerome Jiang <jianj@google.com> Tue Sep 24 21:17:49 2019 +0000
tree c6a47ad906395b9cd134b6a20b6cd9aabeb9a137
parent b75def7527ac63bba4630b69fd0db3d6ace75a64

Remove cnn.{c,h} from CONFIG_REALTIME_ONLY

BUG=aomedia:2397

Change-Id: I96eea24b1c2df4afced322932a449695ce199f07

av1/av1.cmake

diff --git a/av1/av1.cmake b/av1/av1.cmake
index 56c169bf..ea0d309 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -401,14 +401,17 @@
 
 if(CONFIG_REALTIME_ONLY)
   list(REMOVE_ITEM AOM_AV1_ENCODER_SOURCES
+                   "${AOM_ROOT}/av1/encoder/cnn.c"
+                   "${AOM_ROOT}/av1/encoder/cnn.h"
                    "${AOM_ROOT}/av1/encoder/firstpass.c"
                    "${AOM_ROOT}/av1/encoder/firstpass.h"
                    "${AOM_ROOT}/av1/encoder/gop_structure.c"
                    "${AOM_ROOT}/av1/encoder/gop_structure.h"
-                   "${AOM_ROOT}/av1/encoder/pass2_strategy.c"
                    "${AOM_ROOT}/av1/encoder/mbgraph.c"
                    "${AOM_ROOT}/av1/encoder/mbgraph.h"
+                   "${AOM_ROOT}/av1/encoder/partition_cnn_weights.h"
                    "${AOM_ROOT}/av1/encoder/partition_model_weights.h"
+                   "${AOM_ROOT}/av1/encoder/pass2_strategy.c"
                    "${AOM_ROOT}/av1/encoder/temporal_filter.c"
                    "${AOM_ROOT}/av1/encoder/temporal_filter.h"
                    "${AOM_ROOT}/av1/encoder/temporal_filter_constants.h"

test/test.cmake

diff --git a/test/test.cmake b/test/test.cmake
index 95d0e32..4e3540f 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -132,6 +132,7 @@
                 "${AOM_ROOT}/test/yuv_temporal_filter_test.cc")
     if(CONFIG_REALTIME_ONLY)
       list(REMOVE_ITEM AOM_UNIT_TEST_COMMON_SOURCES
+                       "${AOM_ROOT}/test/cnn_test.cc"
                        "${AOM_ROOT}/test/yuv_temporal_filter_test.cc")
     endif()
     if(NOT CONFIG_AV1_HIGHBITDEPTH)