commit f160ad7a20f62c86b25e3edf9995642f782b7292
author Lauren Partin <lpartin@google.com> Wed Aug 12 19:18:52 2020 +0000
committer Lauren Partin <lpartin@google.com> Thu Aug 13 13:17:14 2020 +0000
tree 5833e8f1f4dc2383e29e1461af4bc805a003519f
parent 4ca2c604bbf548f8d884df63987c5602974bac32

Skip optical flow linking if config isn't enabled.

Change-Id: I6c8e050bea8a2904f67abcc42152cba1c33fa1ba

av1/av1.cmake

diff --git a/av1/av1.cmake b/av1/av1.cmake
index 4015801..56957a7 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -189,8 +189,6 @@
             "${AOM_ROOT}/av1/encoder/motion_search_facade.h"
             "${AOM_ROOT}/av1/encoder/mv_prec.c"
             "${AOM_ROOT}/av1/encoder/mv_prec.h"
-            "${AOM_ROOT}/av1/encoder/optical_flow.c"
-            "${AOM_ROOT}/av1/encoder/optical_flow.h"
             "${AOM_ROOT}/av1/encoder/palette.c"
             "${AOM_ROOT}/av1/encoder/palette.h"
             "${AOM_ROOT}/av1/encoder/partition_search.h"
@@ -257,6 +255,11 @@
               "${AOM_ROOT}/av1/encoder/tune_vmaf.h")
 endif()
 
+if(CONFIG_OPTICAL_FLOW_API)
+  list(APPEND AOM_AV1_ENCODER_SOURCES "${AOM_ROOT}/av1/encoder/optical_flow.c"
+              "${AOM_ROOT}/av1/encoder/optical_flow.h")
+endif()
+
 list(APPEND AOM_AV1_COMMON_INTRIN_SSE2
             "${AOM_ROOT}/av1/common/cdef_block_sse2.c"
             "${AOM_ROOT}/av1/common/x86/cfl_sse2.c"

build/cmake/aom_config_defaults.cmake

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 2497ff1..298ed28 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -107,7 +107,6 @@
 set_aom_config_var(DECODE_HEIGHT_LIMIT 0 "Set limit for decode height.")
 set_aom_config_var(DECODE_WIDTH_LIMIT 0 "Set limit for decode width.")
 set_aom_config_var(CONFIG_TUNE_VMAF 0 "Enable encoding tuning for VMAF.")
-set_aom_config_var(CONFIG_OPTICAL_FLOW_API 0 "Enables optical flow API.")
 
 # AV1 experiment flags.
 set_aom_config_var(CONFIG_SPEED_STATS 0 "AV1 experiment flag.")
@@ -137,6 +136,8 @@
 set_aom_config_var(CONFIG_SUPERRES_IN_RECODE 1
                    "Enable encoding both full-res and superres in recode loop"
                    "when AOM_SUPERRES_AUTO mode is used.")
+set_aom_config_var(CONFIG_OPTICAL_FLOW_API 0
+                   "AV1 experiment flag for optical flow API.")
 #
 # Variables in this section control optional features of the build system.
 #