Commit 345e48cc authored by Tom Finegan's avatar Tom Finegan
Browse files

Silence warnings in high bit depth av1 CMake build.

Sync with configure build: dct_neon.c and error_neon.c in
av1/encoder/arm/neon moved to the high bit depth build else.
They are only built when CONFIG_HIGHBITDEPTH is off.

Also moves both source files to AOM_AV1_COMMON_INTRIN_NEON
list since the configure build includes them in av1_{cx,dx}.mk.

Change-Id: Ie315e151438151f02a3aa5ef4757daf7d24f9028
parent b642a46c
......@@ -216,11 +216,6 @@ if (CONFIG_HIGHBITDEPTH)
${AOM_AV1_COMMON_INTRIN_AVX2}
"${AOM_ROOT}/av1/common/x86/highbd_inv_txfm_avx2.c")
set(AOM_AV1_ENCODER_INTRIN_NEON
${AOM_AV1_ENCODER_INTRIN_NEON}
"${AOM_ROOT}/av1/encoder/arm/neon/dct_neon.c"
"${AOM_ROOT}/av1/encoder/arm/neon/error_neon.c")
set(AOM_AV1_ENCODER_INTRIN_SSE4_1
${AOM_AV1_ENCODER_INTRIN_SSE4_1}
"${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_sse4.c"
......@@ -228,8 +223,13 @@ if (CONFIG_HIGHBITDEPTH)
else ()
set(AOM_AV1_COMMON_INTRIN_NEON
${AOM_AV1_COMMON_INTRIN_NEON}
"${AOM_ROOT}/av1/encoder/arm/neon/dct_neon.c"
"${AOM_ROOT}/av1/common/arm/neon/iht4x4_add_neon.c"
"${AOM_ROOT}/av1/common/arm/neon/iht8x8_add_neon.c")
set(AOM_AV1_ENCODER_INTRIN_NEON
${AOM_AV1_ENCODER_INTRIN_NEON}
"${AOM_ROOT}/av1/encoder/arm/neon/error_neon.c")
endif ()
if (CONFIG_CDEF)
......
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