Commit e0157bc8 authored by Tom Finegan's avatar Tom Finegan

Add CONFIG_MOTION_VAR support to the cmake build.

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

Change-Id: I196e343c25e31caffc214f609e5a2f7703b1202e
parent 5cc19c23
......@@ -422,9 +422,7 @@ set(AOM_DSP_ASM_SSE4_1 "${AOM_ROOT}/aom_dsp/x86/sad_sse4.asm")
set(AOM_DSP_INTRIN_SSE4_1
"${AOM_ROOT}/aom_dsp/x86/blend_a64_hmask_sse4.c"
"${AOM_ROOT}/aom_dsp/x86/blend_a64_mask_sse4.c"
"${AOM_ROOT}/aom_dsp/x86/blend_a64_vmask_sse4.c"
"${AOM_ROOT}/aom_dsp/x86/obmc_sad_sse4.c"
"${AOM_ROOT}/aom_dsp/x86/obmc_variance_sse4.c")
"${AOM_ROOT}/aom_dsp/x86/blend_a64_vmask_sse4.c")
set(AOM_DSP_AVX_ASM "${AOM_ROOT}/aom_dsp/x86/quantize_avx_x86_64.asm")
set(AOM_DSP_AVX2_INTRIN
"${AOM_ROOT}/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c"
......@@ -553,9 +551,6 @@ set(AOM_UNIT_TEST_SOURCES
"${AOM_ROOT}/test/lpf_8_test.cc"
"${AOM_ROOT}/test/md5_helper.h"
"${AOM_ROOT}/test/minmax_test.cc"
# requires CONFIG_MOTION_VAR
#"${AOM_ROOT}/test/obmc_sad_test.cc"
#"${AOM_ROOT}/test/obmc_variance_test.cc"
"${AOM_ROOT}/test/partial_idct_test.cc"
# omitted from tests.mk, includes vp8 file.
#"${AOM_ROOT}/test/quantize_test.cc"
......@@ -689,6 +684,17 @@ if (CONFIG_INTERNAL_STATS)
"${AOM_ROOT}/av1/encoder/blockiness.c")
endif ()
if (CONFIG_MOTION_VAR AND HAVE_SSE4_1)
set(AOM_DSP_INTRIN_SSE4_1
${AOM_DSP_INTRIN_SSE4_1}
"${AOM_ROOT}/aom_dsp/x86/obmc_sad_sse4.c"
"${AOM_ROOT}/aom_dsp/x86/obmc_variance_sse4.c")
set(AOM_UNIT_TEST_SOURCES
${AOM_UNIT_TEST_SOURCES}
"${AOM_ROOT}/test/obmc_sad_test.cc"
"${AOM_ROOT}/test/obmc_variance_test.cc")
endif ()
if (CONFIG_AOM_HIGHBITDEPTH)
set(AOM_DSP_ASM_SSE2
${AOM_DSP_ASM_SSE2}
......
......@@ -37,3 +37,4 @@ CONFIG_AOM_HIGHBITDEPTH=${RTCD_CONFIG_AOM_HIGHBITDEPTH}
CONFIG_CLPF=${RTCD_CONFIG_CLPF}
CONFIG_EXT_INTER=${RTCD_CONFIG_EXT_INTER}
CONFIG_INTERNAL_STATS=${RTCD_CONFIG_INTERNAL_STATS}
CONFIG_MOTION_VAR=${RTCD_CONFIG_MOTION_VAR}
......@@ -62,3 +62,6 @@ endif ()
if (CONFIG_INTERNAL_STATS)
set(RTCD_CONFIG_INTERNAL_STATS "yes")
endif ()
if (CONFIG_MOTION_VAR AND HAVE_SSE4_1)
set(RTCD_CONFIG_MOTION_VAR "yes")
endif ()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment