Support CONFIG_WARPED_MOTION in the cmake build. BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=76 Change-Id: Iba1c63b077e0874d0cb639a6e0c9d66cd423af00
diff --git a/av1/av1.cmake b/av1/av1.cmake index 9c8849e..a5f9ec7 100644 --- a/av1/av1.cmake +++ b/av1/av1.cmake
@@ -357,6 +357,17 @@ endif () endif () +if (CONFIG_WARPED_MOTION) + set(AOM_AV1_COMMON_SOURCES + ${AOM_AV1_COMMON_SOURCES} + "${AOM_ROOT}/av1/common/warped_motion.c" + "${AOM_ROOT}/av1/common/warped_motion.h") + + set(AOM_AV1_COMMON_SSE2_INTRIN + ${AOM_AV1_COMMON_SSE2_INTRIN} + "${AOM_ROOT}/av1/common/x86/warp_plane_sse2.c") +endif () + # Setup AV1 common/decoder/encoder targets. The libaom target must exist before # this function is called. function (setup_av1_targets)
diff --git a/test/test.cmake b/test/test.cmake index 9b005c6..611c392f 100644 --- a/test/test.cmake +++ b/test/test.cmake
@@ -40,11 +40,11 @@ if (CONFIG_GLOBAL_MOTION OR CONFIG_WARPED_MOTION) if (HAVE_SSE2) - # TODO: not sure if this is intrinsics or a wrapper calling intrin/asm. set(AOM_UNIT_TEST_COMMON_SOURCES ${AOM_UNIT_TEST_COMMON_SOURCES} "${AOM_ROOT}/test/warp_filter_test.cc" - "${AOM_ROOT}/test/warp_filter_test_util.cc") + "${AOM_ROOT}/test/warp_filter_test_util.cc" + "${AOM_ROOT}/test/warp_filter_test_util.h") endif () endif ()