Commit 18c66343 authored by Tom Finegan's avatar Tom Finegan
Browse files

Fix CONFIG_FILTER_INTRA in the cmake build.

Properly guard usage of av1_filter_intra_taps_4 in
av1/common/x86/filterintra_sse4.c.

Change-Id: I74d589342e4669765d0d4700c329c5f3eced9530
parent 8b370b6e
......@@ -16,6 +16,11 @@
#include "av1/common/enums.h"
#include "av1/common/reconintra.h"
#if USE_3TAP_INTRA_FILTER
void filterintra_sse4_3tap_dummy_func(void);
void filterintra_sse4_3tap_dummy_func(void) {}
#else
static INLINE void AddPixelsSmall(const uint8_t *above, const uint8_t *left,
__m128i *sum) {
const __m128i a = _mm_loadu_si128((const __m128i *)above);
......@@ -889,3 +894,5 @@ void av1_highbd_tm_filter_predictor_sse4_1(uint16_t *dst, ptrdiff_t stride,
HighbdFilterPrediction(above, left, bs, bd, prm, dst, stride);
}
#endif // CONFIG_HIGHBITDEPTH
#endif // USE_3TAP_INTRA_FILTER
......@@ -104,7 +104,7 @@ if (CONFIG_AV1)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
# TODO: not sure if this intrinsics or a wrapper calling intrin/asm.
"${AOM_ROOT}/test/filterintra_predictors_test.cc")
#"${AOM_ROOT}/test/filterintra_predictors_test.cc")
endif ()
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