diff options
author | Johann <johannkoenig@google.com> | 2019-01-10 14:40:13 -0800 |
---|---|---|
committer | Johann <johannkoenig@google.com> | 2019-01-10 14:40:32 -0800 |
commit | 1d63d05fea271329d47168cead72eb6c89a20cd8 (patch) | |
tree | 154bf4eed8f1e8778b49c89c44d4190cb2a7b8b7 | |
parent | 39f132289f51fa4dc94bee6bb8c96a58605db61c (diff) | |
download | platform_external_libaom-1d63d05fea271329d47168cead72eb6c89a20cd8.tar.gz platform_external_libaom-1d63d05fea271329d47168cead72eb6c89a20cd8.tar.bz2 platform_external_libaom-1d63d05fea271329d47168cead72eb6c89a20cd8.zip |
libaom: temporarily disable x86 optimizations
Work around PIC link errors in the dc predictors.
Test: none
BUG=122391143
Change-Id: Iad6aa040d1d7722405c65f692cecf7760f0daf85
-rw-r--r-- | Android.bp | 16 | ||||
-rw-r--r-- | Android.bp.in | 16 | ||||
-rw-r--r-- | config/x86/config/aom_config.asm | 6 | ||||
-rw-r--r-- | config/x86/config/aom_config.c | 2 | ||||
-rw-r--r-- | config/x86/config/aom_config.h | 6 | ||||
-rw-r--r-- | config/x86/config/aom_dsp_rtcd.h | 866 | ||||
-rw-r--r-- | config/x86/config/av1_rtcd.h | 92 | ||||
-rwxr-xr-x | generate_config.sh | 3 |
8 files changed, 344 insertions, 663 deletions
@@ -480,13 +480,15 @@ cc_library_static { aom_scale_sources + aom_sources + aom_util_sources + - aom_dsp_common_asm_sse2 + - aom_dsp_common_asm_ssse3 + - aom_ports_asm_x86 + - aom_av1_common_intrin_sse2 + - aom_dsp_common_intrin_sse2 + - aom_av1_common_intrin_ssse3 + - aom_dsp_common_intrin_ssse3, + aom_ports_asm_x86, + + // Re-enable these targets when the PIC build is fixed + //aom_dsp_common_asm_sse2 + + //aom_dsp_common_asm_ssse3 + + //aom_av1_common_intrin_sse2 + + //aom_dsp_common_intrin_sse2 + + //aom_av1_common_intrin_ssse3 + + //aom_dsp_common_intrin_ssse3, }, }, diff --git a/Android.bp.in b/Android.bp.in index 9c9b93b..5fdb335 100644 --- a/Android.bp.in +++ b/Android.bp.in @@ -88,13 +88,15 @@ cc_library_static { aom_scale_sources + aom_sources + aom_util_sources + - aom_dsp_common_asm_sse2 + - aom_dsp_common_asm_ssse3 + - aom_ports_asm_x86 + - aom_av1_common_intrin_sse2 + - aom_dsp_common_intrin_sse2 + - aom_av1_common_intrin_ssse3 + - aom_dsp_common_intrin_ssse3, + aom_ports_asm_x86, + + // Re-enable these targets when the PIC build is fixed + //aom_dsp_common_asm_sse2 + + //aom_dsp_common_asm_ssse3 + + //aom_av1_common_intrin_sse2 + + //aom_dsp_common_intrin_sse2 + + //aom_av1_common_intrin_ssse3 + + //aom_dsp_common_intrin_ssse3, }, }, diff --git a/config/x86/config/aom_config.asm b/config/x86/config/aom_config.asm index 1b03233..aecc16a 100644 --- a/config/x86/config/aom_config.asm +++ b/config/x86/config/aom_config.asm @@ -59,11 +59,11 @@ %define HAVE_NEON 0 %define HAVE_PTHREAD_H 1 %define HAVE_SSE 1 -%define HAVE_SSE2 1 -%define HAVE_SSE3 1 +%define HAVE_SSE2 0 +%define HAVE_SSE3 0 %define HAVE_SSE4_1 0 %define HAVE_SSE4_2 0 -%define HAVE_SSSE3 1 +%define HAVE_SSSE3 0 %define HAVE_UNISTD_H 1 %define HAVE_VSX 0 %define HAVE_WXWIDGETS 0 diff --git a/config/x86/config/aom_config.c b/config/x86/config/aom_config.c index aeb2523..dac5fd3 100644 --- a/config/x86/config/aom_config.c +++ b/config/x86/config/aom_config.c @@ -9,5 +9,5 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ #include "aom/aom_codec.h" -static const char* const cfg = "cmake ../libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../libaom/build/cmake/toolchains/x86-linux.cmake\" -DCONFIG_AV1_ENCODER=0 -DCONFIG_RUNTIME_CPU_DETECT=0 -DCONFIG_LOWBITDEPTH=1 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DENABLE_SSE4_1=0"; +static const char* const cfg = "cmake ../libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../libaom/build/cmake/toolchains/x86-linux.cmake\" -DCONFIG_AV1_ENCODER=0 -DCONFIG_RUNTIME_CPU_DETECT=0 -DCONFIG_LOWBITDEPTH=1 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DENABLE_SSE2=0 -DENABLE_SSE4_1=0"; const char *aom_codec_build_config(void) {return cfg;} diff --git a/config/x86/config/aom_config.h b/config/x86/config/aom_config.h index e7ed8db..f71e4ef 100644 --- a/config/x86/config/aom_config.h +++ b/config/x86/config/aom_config.h @@ -71,11 +71,11 @@ #define HAVE_NEON 0 #define HAVE_PTHREAD_H 1 #define HAVE_SSE 1 -#define HAVE_SSE2 1 -#define HAVE_SSE3 1 +#define HAVE_SSE2 0 +#define HAVE_SSE3 0 #define HAVE_SSE4_1 0 #define HAVE_SSE4_2 0 -#define HAVE_SSSE3 1 +#define HAVE_SSSE3 0 #define HAVE_UNISTD_H 1 #define HAVE_VSX 0 #define HAVE_WXWIDGETS 0 diff --git a/config/x86/config/aom_dsp_rtcd.h b/config/x86/config/aom_dsp_rtcd.h index 8f11e0b..afb5980 100644 --- a/config/x86/config/aom_dsp_rtcd.h +++ b/config/x86/config/aom_dsp_rtcd.h @@ -32,413 +32,313 @@ void aom_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src #define aom_blend_a64_vmask aom_blend_a64_vmask_c void aom_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -void aom_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -void aom_convolve8_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -#define aom_convolve8_horiz aom_convolve8_horiz_ssse3 +#define aom_convolve8_horiz aom_convolve8_horiz_c void aom_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -void aom_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -void aom_convolve8_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -#define aom_convolve8_vert aom_convolve8_vert_ssse3 +#define aom_convolve8_vert aom_convolve8_vert_c void aom_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -void aom_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -#define aom_convolve_copy aom_convolve_copy_sse2 +#define aom_convolve_copy aom_convolve_copy_c void aom_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_16x16 aom_dc_128_predictor_16x16_sse2 +#define aom_dc_128_predictor_16x16 aom_dc_128_predictor_16x16_c void aom_dc_128_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_16x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_16x32 aom_dc_128_predictor_16x32_sse2 +#define aom_dc_128_predictor_16x32 aom_dc_128_predictor_16x32_c void aom_dc_128_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_16x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_16x4 aom_dc_128_predictor_16x4_sse2 +#define aom_dc_128_predictor_16x4 aom_dc_128_predictor_16x4_c void aom_dc_128_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_16x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_16x64 aom_dc_128_predictor_16x64_sse2 +#define aom_dc_128_predictor_16x64 aom_dc_128_predictor_16x64_c void aom_dc_128_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_16x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_16x8 aom_dc_128_predictor_16x8_sse2 +#define aom_dc_128_predictor_16x8 aom_dc_128_predictor_16x8_c void aom_dc_128_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_128_predictor_2x2 aom_dc_128_predictor_2x2_c void aom_dc_128_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_32x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_32x16 aom_dc_128_predictor_32x16_sse2 +#define aom_dc_128_predictor_32x16 aom_dc_128_predictor_32x16_c void aom_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_32x32 aom_dc_128_predictor_32x32_sse2 +#define aom_dc_128_predictor_32x32 aom_dc_128_predictor_32x32_c void aom_dc_128_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_32x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_32x64 aom_dc_128_predictor_32x64_sse2 +#define aom_dc_128_predictor_32x64 aom_dc_128_predictor_32x64_c void aom_dc_128_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_32x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_32x8 aom_dc_128_predictor_32x8_sse2 +#define aom_dc_128_predictor_32x8 aom_dc_128_predictor_32x8_c void aom_dc_128_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_4x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_4x16 aom_dc_128_predictor_4x16_sse2 +#define aom_dc_128_predictor_4x16 aom_dc_128_predictor_4x16_c void aom_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_4x4 aom_dc_128_predictor_4x4_sse2 +#define aom_dc_128_predictor_4x4 aom_dc_128_predictor_4x4_c void aom_dc_128_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_4x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_4x8 aom_dc_128_predictor_4x8_sse2 +#define aom_dc_128_predictor_4x8 aom_dc_128_predictor_4x8_c void aom_dc_128_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_64x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_64x16 aom_dc_128_predictor_64x16_sse2 +#define aom_dc_128_predictor_64x16 aom_dc_128_predictor_64x16_c void aom_dc_128_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_64x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_64x32 aom_dc_128_predictor_64x32_sse2 +#define aom_dc_128_predictor_64x32 aom_dc_128_predictor_64x32_c void aom_dc_128_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_64x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_64x64 aom_dc_128_predictor_64x64_sse2 +#define aom_dc_128_predictor_64x64 aom_dc_128_predictor_64x64_c void aom_dc_128_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_8x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_8x16 aom_dc_128_predictor_8x16_sse2 +#define aom_dc_128_predictor_8x16 aom_dc_128_predictor_8x16_c void aom_dc_128_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_8x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_8x32 aom_dc_128_predictor_8x32_sse2 +#define aom_dc_128_predictor_8x32 aom_dc_128_predictor_8x32_c void aom_dc_128_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_8x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_8x4 aom_dc_128_predictor_8x4_sse2 +#define aom_dc_128_predictor_8x4 aom_dc_128_predictor_8x4_c void aom_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_128_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_128_predictor_8x8 aom_dc_128_predictor_8x8_sse2 +#define aom_dc_128_predictor_8x8 aom_dc_128_predictor_8x8_c void aom_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_16x16 aom_dc_left_predictor_16x16_sse2 +#define aom_dc_left_predictor_16x16 aom_dc_left_predictor_16x16_c void aom_dc_left_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_16x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_16x32 aom_dc_left_predictor_16x32_sse2 +#define aom_dc_left_predictor_16x32 aom_dc_left_predictor_16x32_c void aom_dc_left_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_16x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_16x4 aom_dc_left_predictor_16x4_sse2 +#define aom_dc_left_predictor_16x4 aom_dc_left_predictor_16x4_c void aom_dc_left_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_16x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_16x64 aom_dc_left_predictor_16x64_sse2 +#define aom_dc_left_predictor_16x64 aom_dc_left_predictor_16x64_c void aom_dc_left_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_16x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_16x8 aom_dc_left_predictor_16x8_sse2 +#define aom_dc_left_predictor_16x8 aom_dc_left_predictor_16x8_c void aom_dc_left_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_left_predictor_2x2 aom_dc_left_predictor_2x2_c void aom_dc_left_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_32x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_32x16 aom_dc_left_predictor_32x16_sse2 +#define aom_dc_left_predictor_32x16 aom_dc_left_predictor_32x16_c void aom_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_32x32 aom_dc_left_predictor_32x32_sse2 +#define aom_dc_left_predictor_32x32 aom_dc_left_predictor_32x32_c void aom_dc_left_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_32x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_32x64 aom_dc_left_predictor_32x64_sse2 +#define aom_dc_left_predictor_32x64 aom_dc_left_predictor_32x64_c void aom_dc_left_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_32x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_32x8 aom_dc_left_predictor_32x8_sse2 +#define aom_dc_left_predictor_32x8 aom_dc_left_predictor_32x8_c void aom_dc_left_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_4x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_4x16 aom_dc_left_predictor_4x16_sse2 +#define aom_dc_left_predictor_4x16 aom_dc_left_predictor_4x16_c void aom_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_4x4 aom_dc_left_predictor_4x4_sse2 +#define aom_dc_left_predictor_4x4 aom_dc_left_predictor_4x4_c void aom_dc_left_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_4x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_4x8 aom_dc_left_predictor_4x8_sse2 +#define aom_dc_left_predictor_4x8 aom_dc_left_predictor_4x8_c void aom_dc_left_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_64x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_64x16 aom_dc_left_predictor_64x16_sse2 +#define aom_dc_left_predictor_64x16 aom_dc_left_predictor_64x16_c void aom_dc_left_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_64x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_64x32 aom_dc_left_predictor_64x32_sse2 +#define aom_dc_left_predictor_64x32 aom_dc_left_predictor_64x32_c void aom_dc_left_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_64x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_64x64 aom_dc_left_predictor_64x64_sse2 +#define aom_dc_left_predictor_64x64 aom_dc_left_predictor_64x64_c void aom_dc_left_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_8x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_8x16 aom_dc_left_predictor_8x16_sse2 +#define aom_dc_left_predictor_8x16 aom_dc_left_predictor_8x16_c void aom_dc_left_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_8x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_8x32 aom_dc_left_predictor_8x32_sse2 +#define aom_dc_left_predictor_8x32 aom_dc_left_predictor_8x32_c void aom_dc_left_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_8x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_8x4 aom_dc_left_predictor_8x4_sse2 +#define aom_dc_left_predictor_8x4 aom_dc_left_predictor_8x4_c void aom_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_left_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_left_predictor_8x8 aom_dc_left_predictor_8x8_sse2 +#define aom_dc_left_predictor_8x8 aom_dc_left_predictor_8x8_c void aom_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_16x16 aom_dc_predictor_16x16_sse2 +#define aom_dc_predictor_16x16 aom_dc_predictor_16x16_c void aom_dc_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_16x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_16x32 aom_dc_predictor_16x32_sse2 +#define aom_dc_predictor_16x32 aom_dc_predictor_16x32_c void aom_dc_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_16x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_16x4 aom_dc_predictor_16x4_sse2 +#define aom_dc_predictor_16x4 aom_dc_predictor_16x4_c void aom_dc_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_16x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_16x64 aom_dc_predictor_16x64_sse2 +#define aom_dc_predictor_16x64 aom_dc_predictor_16x64_c void aom_dc_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_16x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_16x8 aom_dc_predictor_16x8_sse2 +#define aom_dc_predictor_16x8 aom_dc_predictor_16x8_c void aom_dc_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_predictor_2x2 aom_dc_predictor_2x2_c void aom_dc_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_32x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_32x16 aom_dc_predictor_32x16_sse2 +#define aom_dc_predictor_32x16 aom_dc_predictor_32x16_c void aom_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_32x32 aom_dc_predictor_32x32_sse2 +#define aom_dc_predictor_32x32 aom_dc_predictor_32x32_c void aom_dc_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_32x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_32x64 aom_dc_predictor_32x64_sse2 +#define aom_dc_predictor_32x64 aom_dc_predictor_32x64_c void aom_dc_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_32x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_32x8 aom_dc_predictor_32x8_sse2 +#define aom_dc_predictor_32x8 aom_dc_predictor_32x8_c void aom_dc_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_4x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_4x16 aom_dc_predictor_4x16_sse2 +#define aom_dc_predictor_4x16 aom_dc_predictor_4x16_c void aom_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_4x4 aom_dc_predictor_4x4_sse2 +#define aom_dc_predictor_4x4 aom_dc_predictor_4x4_c void aom_dc_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_4x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_4x8 aom_dc_predictor_4x8_sse2 +#define aom_dc_predictor_4x8 aom_dc_predictor_4x8_c void aom_dc_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_64x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_64x16 aom_dc_predictor_64x16_sse2 +#define aom_dc_predictor_64x16 aom_dc_predictor_64x16_c void aom_dc_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_64x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_64x32 aom_dc_predictor_64x32_sse2 +#define aom_dc_predictor_64x32 aom_dc_predictor_64x32_c void aom_dc_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_64x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_64x64 aom_dc_predictor_64x64_sse2 +#define aom_dc_predictor_64x64 aom_dc_predictor_64x64_c void aom_dc_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_8x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_8x16 aom_dc_predictor_8x16_sse2 +#define aom_dc_predictor_8x16 aom_dc_predictor_8x16_c void aom_dc_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_8x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_8x32 aom_dc_predictor_8x32_sse2 +#define aom_dc_predictor_8x32 aom_dc_predictor_8x32_c void aom_dc_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_8x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_8x4 aom_dc_predictor_8x4_sse2 +#define aom_dc_predictor_8x4 aom_dc_predictor_8x4_c void aom_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_predictor_8x8 aom_dc_predictor_8x8_sse2 +#define aom_dc_predictor_8x8 aom_dc_predictor_8x8_c void aom_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_16x16 aom_dc_top_predictor_16x16_sse2 +#define aom_dc_top_predictor_16x16 aom_dc_top_predictor_16x16_c void aom_dc_top_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_16x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_16x32 aom_dc_top_predictor_16x32_sse2 +#define aom_dc_top_predictor_16x32 aom_dc_top_predictor_16x32_c void aom_dc_top_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_16x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_16x4 aom_dc_top_predictor_16x4_sse2 +#define aom_dc_top_predictor_16x4 aom_dc_top_predictor_16x4_c void aom_dc_top_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_16x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_16x64 aom_dc_top_predictor_16x64_sse2 +#define aom_dc_top_predictor_16x64 aom_dc_top_predictor_16x64_c void aom_dc_top_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_16x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_16x8 aom_dc_top_predictor_16x8_sse2 +#define aom_dc_top_predictor_16x8 aom_dc_top_predictor_16x8_c void aom_dc_top_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_top_predictor_2x2 aom_dc_top_predictor_2x2_c void aom_dc_top_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_32x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_32x16 aom_dc_top_predictor_32x16_sse2 +#define aom_dc_top_predictor_32x16 aom_dc_top_predictor_32x16_c void aom_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_32x32 aom_dc_top_predictor_32x32_sse2 +#define aom_dc_top_predictor_32x32 aom_dc_top_predictor_32x32_c void aom_dc_top_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_32x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_32x64 aom_dc_top_predictor_32x64_sse2 +#define aom_dc_top_predictor_32x64 aom_dc_top_predictor_32x64_c void aom_dc_top_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_32x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_32x8 aom_dc_top_predictor_32x8_sse2 +#define aom_dc_top_predictor_32x8 aom_dc_top_predictor_32x8_c void aom_dc_top_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_4x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_4x16 aom_dc_top_predictor_4x16_sse2 +#define aom_dc_top_predictor_4x16 aom_dc_top_predictor_4x16_c void aom_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_4x4 aom_dc_top_predictor_4x4_sse2 +#define aom_dc_top_predictor_4x4 aom_dc_top_predictor_4x4_c void aom_dc_top_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_4x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_4x8 aom_dc_top_predictor_4x8_sse2 +#define aom_dc_top_predictor_4x8 aom_dc_top_predictor_4x8_c void aom_dc_top_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_64x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_64x16 aom_dc_top_predictor_64x16_sse2 +#define aom_dc_top_predictor_64x16 aom_dc_top_predictor_64x16_c void aom_dc_top_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_64x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_64x32 aom_dc_top_predictor_64x32_sse2 +#define aom_dc_top_predictor_64x32 aom_dc_top_predictor_64x32_c void aom_dc_top_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_64x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_64x64 aom_dc_top_predictor_64x64_sse2 +#define aom_dc_top_predictor_64x64 aom_dc_top_predictor_64x64_c void aom_dc_top_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_8x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_8x16 aom_dc_top_predictor_8x16_sse2 +#define aom_dc_top_predictor_8x16 aom_dc_top_predictor_8x16_c void aom_dc_top_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_8x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_8x32 aom_dc_top_predictor_8x32_sse2 +#define aom_dc_top_predictor_8x32 aom_dc_top_predictor_8x32_c void aom_dc_top_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_8x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_8x4 aom_dc_top_predictor_8x4_sse2 +#define aom_dc_top_predictor_8x4 aom_dc_top_predictor_8x4_c void aom_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_dc_top_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_dc_top_predictor_8x8 aom_dc_top_predictor_8x8_sse2 +#define aom_dc_top_predictor_8x8 aom_dc_top_predictor_8x8_c void aom_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_16x16 aom_h_predictor_16x16_sse2 +#define aom_h_predictor_16x16 aom_h_predictor_16x16_c void aom_h_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_16x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_16x32 aom_h_predictor_16x32_sse2 +#define aom_h_predictor_16x32 aom_h_predictor_16x32_c void aom_h_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_16x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_16x4 aom_h_predictor_16x4_sse2 +#define aom_h_predictor_16x4 aom_h_predictor_16x4_c void aom_h_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_16x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_16x64 aom_h_predictor_16x64_sse2 +#define aom_h_predictor_16x64 aom_h_predictor_16x64_c void aom_h_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_16x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_16x8 aom_h_predictor_16x8_sse2 +#define aom_h_predictor_16x8 aom_h_predictor_16x8_c void aom_h_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_h_predictor_2x2 aom_h_predictor_2x2_c void aom_h_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_32x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_32x16 aom_h_predictor_32x16_sse2 +#define aom_h_predictor_32x16 aom_h_predictor_32x16_c void aom_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_32x32 aom_h_predictor_32x32_sse2 +#define aom_h_predictor_32x32 aom_h_predictor_32x32_c void aom_h_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_32x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_32x64 aom_h_predictor_32x64_sse2 +#define aom_h_predictor_32x64 aom_h_predictor_32x64_c void aom_h_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_32x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_32x8 aom_h_predictor_32x8_sse2 +#define aom_h_predictor_32x8 aom_h_predictor_32x8_c void aom_h_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_4x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_4x16 aom_h_predictor_4x16_sse2 +#define aom_h_predictor_4x16 aom_h_predictor_4x16_c void aom_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_4x4 aom_h_predictor_4x4_sse2 +#define aom_h_predictor_4x4 aom_h_predictor_4x4_c void aom_h_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_4x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_4x8 aom_h_predictor_4x8_sse2 +#define aom_h_predictor_4x8 aom_h_predictor_4x8_c void aom_h_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_64x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_64x16 aom_h_predictor_64x16_sse2 +#define aom_h_predictor_64x16 aom_h_predictor_64x16_c void aom_h_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_64x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_64x32 aom_h_predictor_64x32_sse2 +#define aom_h_predictor_64x32 aom_h_predictor_64x32_c void aom_h_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_64x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_64x64 aom_h_predictor_64x64_sse2 +#define aom_h_predictor_64x64 aom_h_predictor_64x64_c void aom_h_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_8x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_8x16 aom_h_predictor_8x16_sse2 +#define aom_h_predictor_8x16 aom_h_predictor_8x16_c void aom_h_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_8x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_8x32 aom_h_predictor_8x32_sse2 +#define aom_h_predictor_8x32 aom_h_predictor_8x32_c void aom_h_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_8x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_8x4 aom_h_predictor_8x4_sse2 +#define aom_h_predictor_8x4 aom_h_predictor_8x4_c void aom_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_h_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_h_predictor_8x8 aom_h_predictor_8x8_sse2 +#define aom_h_predictor_8x8 aom_h_predictor_8x8_c void aom_highbd_blend_a64_d16_mask_c(uint8_t *dst, uint32_t dst_stride, const CONV_BUF_TYPE *src0, uint32_t src0_stride, const CONV_BUF_TYPE *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int w, int h, int subx, int suby, ConvolveParams *conv_params, const int bd); #define aom_highbd_blend_a64_d16_mask aom_highbd_blend_a64_d16_mask_c @@ -453,24 +353,19 @@ void aom_highbd_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride, const uint8 #define aom_highbd_blend_a64_vmask aom_highbd_blend_a64_vmask_c void aom_highbd_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); -void aom_highbd_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); -#define aom_highbd_convolve8_horiz aom_highbd_convolve8_horiz_sse2 +#define aom_highbd_convolve8_horiz aom_highbd_convolve8_horiz_c void aom_highbd_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); -void aom_highbd_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); -#define aom_highbd_convolve8_vert aom_highbd_convolve8_vert_sse2 +#define aom_highbd_convolve8_vert aom_highbd_convolve8_vert_c void aom_highbd_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); -void aom_highbd_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); -#define aom_highbd_convolve_copy aom_highbd_convolve_copy_sse2 +#define aom_highbd_convolve_copy aom_highbd_convolve_copy_c void aom_highbd_dc_128_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_128_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_sse2 +#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_c void aom_highbd_dc_128_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_128_predictor_16x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_sse2 +#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_c void aom_highbd_dc_128_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c @@ -479,19 +374,16 @@ void aom_highbd_dc_128_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, cons #define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c void aom_highbd_dc_128_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_128_predictor_16x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_sse2 +#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_c void aom_highbd_dc_128_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c void aom_highbd_dc_128_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_128_predictor_32x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_sse2 +#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_c void aom_highbd_dc_128_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_128_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_sse2 +#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_c void aom_highbd_dc_128_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c @@ -503,12 +395,10 @@ void aom_highbd_dc_128_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const #define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c void aom_highbd_dc_128_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_128_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_sse2 +#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_c void aom_highbd_dc_128_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_128_predictor_4x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_sse2 +#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_c void aom_highbd_dc_128_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c @@ -520,27 +410,22 @@ void aom_highbd_dc_128_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, cons #define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c void aom_highbd_dc_128_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_128_predictor_8x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_sse2 +#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_c void aom_highbd_dc_128_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c void aom_highbd_dc_128_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_128_predictor_8x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_sse2 +#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_c void aom_highbd_dc_128_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_128_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_sse2 +#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_c void aom_highbd_dc_left_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_left_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_sse2 +#define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_c void aom_highbd_dc_left_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_left_predictor_16x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_sse2 +#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_c void aom_highbd_dc_left_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c @@ -549,19 +434,16 @@ void aom_highbd_dc_left_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, con #define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c void aom_highbd_dc_left_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_left_predictor_16x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_sse2 +#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_c void aom_highbd_dc_left_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c void aom_highbd_dc_left_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_left_predictor_32x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_sse2 +#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_c void aom_highbd_dc_left_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_left_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_sse2 +#define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_c void aom_highbd_dc_left_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c @@ -573,12 +455,10 @@ void aom_highbd_dc_left_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, cons #define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c void aom_highbd_dc_left_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_left_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_sse2 +#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_c void aom_highbd_dc_left_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_left_predictor_4x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_sse2 +#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_c void aom_highbd_dc_left_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c @@ -590,27 +470,22 @@ void aom_highbd_dc_left_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, con #define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c void aom_highbd_dc_left_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_left_predictor_8x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_sse2 +#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_c void aom_highbd_dc_left_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c void aom_highbd_dc_left_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_left_predictor_8x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_sse2 +#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_c void aom_highbd_dc_left_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_left_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_sse2 +#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_c void aom_highbd_dc_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_sse2 +#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_c void aom_highbd_dc_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_predictor_16x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_sse2 +#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_c void aom_highbd_dc_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c @@ -619,19 +494,16 @@ void aom_highbd_dc_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const ui #define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c void aom_highbd_dc_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_predictor_16x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_sse2 +#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_c void aom_highbd_dc_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c void aom_highbd_dc_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_predictor_32x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_sse2 +#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_c void aom_highbd_dc_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_sse2 +#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_c void aom_highbd_dc_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c @@ -643,12 +515,10 @@ void aom_highbd_dc_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uin #define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c void aom_highbd_dc_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_sse2 +#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_c void aom_highbd_dc_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_predictor_4x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_sse2 +#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_c void aom_highbd_dc_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c @@ -660,27 +530,22 @@ void aom_highbd_dc_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const ui #define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_c void aom_highbd_dc_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_predictor_8x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_sse2 +#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_c void aom_highbd_dc_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c void aom_highbd_dc_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_predictor_8x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_sse2 +#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_c void aom_highbd_dc_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_sse2 +#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_c void aom_highbd_dc_top_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_top_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_sse2 +#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_c void aom_highbd_dc_top_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_top_predictor_16x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_sse2 +#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_c void aom_highbd_dc_top_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c @@ -689,19 +554,16 @@ void aom_highbd_dc_top_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, cons #define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c void aom_highbd_dc_top_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_top_predictor_16x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_sse2 +#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_c void aom_highbd_dc_top_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c void aom_highbd_dc_top_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_top_predictor_32x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_sse2 +#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_c void aom_highbd_dc_top_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_top_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_sse2 +#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_c void aom_highbd_dc_top_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c @@ -713,12 +575,10 @@ void aom_highbd_dc_top_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const #define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c void aom_highbd_dc_top_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_top_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_sse2 +#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_c void aom_highbd_dc_top_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_top_predictor_4x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_sse2 +#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_c void aom_highbd_dc_top_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c @@ -730,27 +590,22 @@ void aom_highbd_dc_top_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, cons #define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c void aom_highbd_dc_top_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_top_predictor_8x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_sse2 +#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_c void aom_highbd_dc_top_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c void aom_highbd_dc_top_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_top_predictor_8x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_sse2 +#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_c void aom_highbd_dc_top_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_dc_top_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_sse2 +#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_c void aom_highbd_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_h_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_sse2 +#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_c void aom_highbd_h_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_h_predictor_16x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_sse2 +#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_c void aom_highbd_h_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c @@ -759,19 +614,16 @@ void aom_highbd_h_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uin #define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c void aom_highbd_h_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_h_predictor_16x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_sse2 +#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_c void aom_highbd_h_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c void aom_highbd_h_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_h_predictor_32x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_sse2 +#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_c void aom_highbd_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_h_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_sse2 +#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_c void aom_highbd_h_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c @@ -783,12 +635,10 @@ void aom_highbd_h_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint #define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c void aom_highbd_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_h_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_sse2 +#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_c void aom_highbd_h_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_h_predictor_4x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_sse2 +#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_c void aom_highbd_h_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c @@ -800,83 +650,64 @@ void aom_highbd_h_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uin #define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c void aom_highbd_h_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_h_predictor_8x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_sse2 +#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_c void aom_highbd_h_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c void aom_highbd_h_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_h_predictor_8x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_sse2 +#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_c void aom_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_h_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_sse2 +#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c void aom_highbd_lpf_horizontal_14_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -void aom_highbd_lpf_horizontal_14_sse2(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_sse2 +#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_c void aom_highbd_lpf_horizontal_14_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limt1, const uint8_t *thresh1,int bd); -void aom_highbd_lpf_horizontal_14_dual_sse2(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limt1, const uint8_t *thresh1,int bd); -#define aom_highbd_lpf_horizontal_14_dual aom_highbd_lpf_horizontal_14_dual_sse2 +#define aom_highbd_lpf_horizontal_14_dual aom_highbd_lpf_horizontal_14_dual_c void aom_highbd_lpf_horizontal_4_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -void aom_highbd_lpf_horizontal_4_sse2(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_sse2 +#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_c void aom_highbd_lpf_horizontal_4_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -void aom_highbd_lpf_horizontal_4_dual_sse2(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -#define aom_highbd_lpf_horizontal_4_dual aom_highbd_lpf_horizontal_4_dual_sse2 +#define aom_highbd_lpf_horizontal_4_dual aom_highbd_lpf_horizontal_4_dual_c void aom_highbd_lpf_horizontal_6_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -void aom_highbd_lpf_horizontal_6_sse2(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_sse2 +#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_c void aom_highbd_lpf_horizontal_6_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -void aom_highbd_lpf_horizontal_6_dual_sse2(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_sse2 +#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_c void aom_highbd_lpf_horizontal_8_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -void aom_highbd_lpf_horizontal_8_sse2(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_sse2 +#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_c void aom_highbd_lpf_horizontal_8_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -void aom_highbd_lpf_horizontal_8_dual_sse2(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -#define aom_highbd_lpf_horizontal_8_dual aom_highbd_lpf_horizontal_8_dual_sse2 +#define aom_highbd_lpf_horizontal_8_dual aom_highbd_lpf_horizontal_8_dual_c void aom_highbd_lpf_vertical_14_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -void aom_highbd_lpf_vertical_14_sse2(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_sse2 +#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_c void aom_highbd_lpf_vertical_14_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -void aom_highbd_lpf_vertical_14_dual_sse2(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -#define aom_highbd_lpf_vertical_14_dual aom_highbd_lpf_vertical_14_dual_sse2 +#define aom_highbd_lpf_vertical_14_dual aom_highbd_lpf_vertical_14_dual_c void aom_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -void aom_highbd_lpf_vertical_4_sse2(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_sse2 +#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_c void aom_highbd_lpf_vertical_4_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -void aom_highbd_lpf_vertical_4_dual_sse2(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -#define aom_highbd_lpf_vertical_4_dual aom_highbd_lpf_vertical_4_dual_sse2 +#define aom_highbd_lpf_vertical_4_dual aom_highbd_lpf_vertical_4_dual_c void aom_highbd_lpf_vertical_6_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -void aom_highbd_lpf_vertical_6_sse2(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_sse2 +#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_c void aom_highbd_lpf_vertical_6_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -void aom_highbd_lpf_vertical_6_dual_sse2(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_sse2 +#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_c void aom_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -void aom_highbd_lpf_vertical_8_sse2(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd); -#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_sse2 +#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_c void aom_highbd_lpf_vertical_8_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -void aom_highbd_lpf_vertical_8_dual_sse2(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd); -#define aom_highbd_lpf_vertical_8_dual aom_highbd_lpf_vertical_8_dual_sse2 +#define aom_highbd_lpf_vertical_8_dual aom_highbd_lpf_vertical_8_dual_c void aom_highbd_paeth_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c @@ -1119,12 +950,10 @@ void aom_highbd_smooth_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, cons #define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c void aom_highbd_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_v_predictor_16x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_sse2 +#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_c void aom_highbd_v_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_v_predictor_16x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_sse2 +#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_c void aom_highbd_v_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c @@ -1133,19 +962,16 @@ void aom_highbd_v_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uin #define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c void aom_highbd_v_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_v_predictor_16x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_sse2 +#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_c void aom_highbd_v_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c void aom_highbd_v_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_v_predictor_32x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_sse2 +#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_c void aom_highbd_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_v_predictor_32x32_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_sse2 +#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_c void aom_highbd_v_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c @@ -1157,12 +983,10 @@ void aom_highbd_v_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint #define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c void aom_highbd_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_v_predictor_4x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_sse2 +#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_c void aom_highbd_v_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_v_predictor_4x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_sse2 +#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_c void aom_highbd_v_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c @@ -1174,481 +998,367 @@ void aom_highbd_v_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uin #define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c void aom_highbd_v_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_v_predictor_8x16_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_sse2 +#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_c void aom_highbd_v_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c void aom_highbd_v_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_v_predictor_8x4_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_sse2 +#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_c void aom_highbd_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -void aom_highbd_v_predictor_8x8_sse2(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_sse2 +#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_c void aom_lowbd_blend_a64_d16_mask_c(uint8_t *dst, uint32_t dst_stride, const CONV_BUF_TYPE *src0, uint32_t src0_stride, const CONV_BUF_TYPE *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int w, int h, int subx, int suby, ConvolveParams *conv_params); #define aom_lowbd_blend_a64_d16_mask aom_lowbd_blend_a64_d16_mask_c void aom_lpf_horizontal_14_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_horizontal_14_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -#define aom_lpf_horizontal_14 aom_lpf_horizontal_14_sse2 +#define aom_lpf_horizontal_14 aom_lpf_horizontal_14_c void aom_lpf_horizontal_14_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_horizontal_14_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -#define aom_lpf_horizontal_14_dual aom_lpf_horizontal_14_dual_sse2 +#define aom_lpf_horizontal_14_dual aom_lpf_horizontal_14_dual_c void aom_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_horizontal_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -#define aom_lpf_horizontal_4 aom_lpf_horizontal_4_sse2 +#define aom_lpf_horizontal_4 aom_lpf_horizontal_4_c void aom_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_horizontal_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -#define aom_lpf_horizontal_4_dual aom_lpf_horizontal_4_dual_sse2 +#define aom_lpf_horizontal_4_dual aom_lpf_horizontal_4_dual_c void aom_lpf_horizontal_6_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_horizontal_6_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -#define aom_lpf_horizontal_6 aom_lpf_horizontal_6_sse2 +#define aom_lpf_horizontal_6 aom_lpf_horizontal_6_c void aom_lpf_horizontal_6_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_horizontal_6_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -#define aom_lpf_horizontal_6_dual aom_lpf_horizontal_6_dual_sse2 +#define aom_lpf_horizontal_6_dual aom_lpf_horizontal_6_dual_c void aom_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_horizontal_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -#define aom_lpf_horizontal_8 aom_lpf_horizontal_8_sse2 +#define aom_lpf_horizontal_8 aom_lpf_horizontal_8_c void aom_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_horizontal_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -#define aom_lpf_horizontal_8_dual aom_lpf_horizontal_8_dual_sse2 +#define aom_lpf_horizontal_8_dual aom_lpf_horizontal_8_dual_c void aom_lpf_vertical_14_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_vertical_14_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -#define aom_lpf_vertical_14 aom_lpf_vertical_14_sse2 +#define aom_lpf_vertical_14 aom_lpf_vertical_14_c void aom_lpf_vertical_14_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_vertical_14_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -#define aom_lpf_vertical_14_dual aom_lpf_vertical_14_dual_sse2 +#define aom_lpf_vertical_14_dual aom_lpf_vertical_14_dual_c void aom_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_vertical_4_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -#define aom_lpf_vertical_4 aom_lpf_vertical_4_sse2 +#define aom_lpf_vertical_4 aom_lpf_vertical_4_c void aom_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_vertical_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -#define aom_lpf_vertical_4_dual aom_lpf_vertical_4_dual_sse2 +#define aom_lpf_vertical_4_dual aom_lpf_vertical_4_dual_c void aom_lpf_vertical_6_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_vertical_6_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -#define aom_lpf_vertical_6 aom_lpf_vertical_6_sse2 +#define aom_lpf_vertical_6 aom_lpf_vertical_6_c void aom_lpf_vertical_6_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_vertical_6_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -#define aom_lpf_vertical_6_dual aom_lpf_vertical_6_dual_sse2 +#define aom_lpf_vertical_6_dual aom_lpf_vertical_6_dual_c void aom_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_vertical_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -#define aom_lpf_vertical_8 aom_lpf_vertical_8_sse2 +#define aom_lpf_vertical_8 aom_lpf_vertical_8_c void aom_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_vertical_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -#define aom_lpf_vertical_8_dual aom_lpf_vertical_8_dual_sse2 +#define aom_lpf_vertical_8_dual aom_lpf_vertical_8_dual_c void aom_paeth_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_16x16 aom_paeth_predictor_16x16_ssse3 +#define aom_paeth_predictor_16x16 aom_paeth_predictor_16x16_c void aom_paeth_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_16x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_16x32 aom_paeth_predictor_16x32_ssse3 +#define aom_paeth_predictor_16x32 aom_paeth_predictor_16x32_c void aom_paeth_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_16x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_16x4 aom_paeth_predictor_16x4_ssse3 +#define aom_paeth_predictor_16x4 aom_paeth_predictor_16x4_c void aom_paeth_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_16x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_16x64 aom_paeth_predictor_16x64_ssse3 +#define aom_paeth_predictor_16x64 aom_paeth_predictor_16x64_c void aom_paeth_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_16x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_16x8 aom_paeth_predictor_16x8_ssse3 +#define aom_paeth_predictor_16x8 aom_paeth_predictor_16x8_c void aom_paeth_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_paeth_predictor_2x2 aom_paeth_predictor_2x2_c void aom_paeth_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_32x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_32x16 aom_paeth_predictor_32x16_ssse3 +#define aom_paeth_predictor_32x16 aom_paeth_predictor_32x16_c void aom_paeth_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_32x32 aom_paeth_predictor_32x32_ssse3 +#define aom_paeth_predictor_32x32 aom_paeth_predictor_32x32_c void aom_paeth_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_32x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_32x64 aom_paeth_predictor_32x64_ssse3 +#define aom_paeth_predictor_32x64 aom_paeth_predictor_32x64_c void aom_paeth_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_32x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_32x8 aom_paeth_predictor_32x8_ssse3 +#define aom_paeth_predictor_32x8 aom_paeth_predictor_32x8_c void aom_paeth_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_4x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_4x16 aom_paeth_predictor_4x16_ssse3 +#define aom_paeth_predictor_4x16 aom_paeth_predictor_4x16_c void aom_paeth_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_4x4 aom_paeth_predictor_4x4_ssse3 +#define aom_paeth_predictor_4x4 aom_paeth_predictor_4x4_c void aom_paeth_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_4x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_4x8 aom_paeth_predictor_4x8_ssse3 +#define aom_paeth_predictor_4x8 aom_paeth_predictor_4x8_c void aom_paeth_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_64x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_64x16 aom_paeth_predictor_64x16_ssse3 +#define aom_paeth_predictor_64x16 aom_paeth_predictor_64x16_c void aom_paeth_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_64x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_64x32 aom_paeth_predictor_64x32_ssse3 +#define aom_paeth_predictor_64x32 aom_paeth_predictor_64x32_c void aom_paeth_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_64x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_64x64 aom_paeth_predictor_64x64_ssse3 +#define aom_paeth_predictor_64x64 aom_paeth_predictor_64x64_c void aom_paeth_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_8x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_8x16 aom_paeth_predictor_8x16_ssse3 +#define aom_paeth_predictor_8x16 aom_paeth_predictor_8x16_c void aom_paeth_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_8x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_8x32 aom_paeth_predictor_8x32_ssse3 +#define aom_paeth_predictor_8x32 aom_paeth_predictor_8x32_c void aom_paeth_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_8x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_8x4 aom_paeth_predictor_8x4_ssse3 +#define aom_paeth_predictor_8x4 aom_paeth_predictor_8x4_c void aom_paeth_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_paeth_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_paeth_predictor_8x8 aom_paeth_predictor_8x8_ssse3 +#define aom_paeth_predictor_8x8 aom_paeth_predictor_8x8_c void aom_smooth_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_16x16 aom_smooth_h_predictor_16x16_ssse3 +#define aom_smooth_h_predictor_16x16 aom_smooth_h_predictor_16x16_c void aom_smooth_h_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_16x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_16x32 aom_smooth_h_predictor_16x32_ssse3 +#define aom_smooth_h_predictor_16x32 aom_smooth_h_predictor_16x32_c void aom_smooth_h_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_16x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_16x4 aom_smooth_h_predictor_16x4_ssse3 +#define aom_smooth_h_predictor_16x4 aom_smooth_h_predictor_16x4_c void aom_smooth_h_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_16x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_16x64 aom_smooth_h_predictor_16x64_ssse3 +#define aom_smooth_h_predictor_16x64 aom_smooth_h_predictor_16x64_c void aom_smooth_h_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_16x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_16x8 aom_smooth_h_predictor_16x8_ssse3 +#define aom_smooth_h_predictor_16x8 aom_smooth_h_predictor_16x8_c void aom_smooth_h_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_smooth_h_predictor_2x2 aom_smooth_h_predictor_2x2_c void aom_smooth_h_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_32x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_32x16 aom_smooth_h_predictor_32x16_ssse3 +#define aom_smooth_h_predictor_32x16 aom_smooth_h_predictor_32x16_c void aom_smooth_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_32x32 aom_smooth_h_predictor_32x32_ssse3 +#define aom_smooth_h_predictor_32x32 aom_smooth_h_predictor_32x32_c void aom_smooth_h_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_32x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_32x64 aom_smooth_h_predictor_32x64_ssse3 +#define aom_smooth_h_predictor_32x64 aom_smooth_h_predictor_32x64_c void aom_smooth_h_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_32x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_32x8 aom_smooth_h_predictor_32x8_ssse3 +#define aom_smooth_h_predictor_32x8 aom_smooth_h_predictor_32x8_c void aom_smooth_h_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_4x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_4x16 aom_smooth_h_predictor_4x16_ssse3 +#define aom_smooth_h_predictor_4x16 aom_smooth_h_predictor_4x16_c void aom_smooth_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_4x4 aom_smooth_h_predictor_4x4_ssse3 +#define aom_smooth_h_predictor_4x4 aom_smooth_h_predictor_4x4_c void aom_smooth_h_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_4x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_4x8 aom_smooth_h_predictor_4x8_ssse3 +#define aom_smooth_h_predictor_4x8 aom_smooth_h_predictor_4x8_c void aom_smooth_h_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_64x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_64x16 aom_smooth_h_predictor_64x16_ssse3 +#define aom_smooth_h_predictor_64x16 aom_smooth_h_predictor_64x16_c void aom_smooth_h_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_64x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_64x32 aom_smooth_h_predictor_64x32_ssse3 +#define aom_smooth_h_predictor_64x32 aom_smooth_h_predictor_64x32_c void aom_smooth_h_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_64x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_64x64 aom_smooth_h_predictor_64x64_ssse3 +#define aom_smooth_h_predictor_64x64 aom_smooth_h_predictor_64x64_c void aom_smooth_h_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_8x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_8x16 aom_smooth_h_predictor_8x16_ssse3 +#define aom_smooth_h_predictor_8x16 aom_smooth_h_predictor_8x16_c void aom_smooth_h_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_8x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_8x32 aom_smooth_h_predictor_8x32_ssse3 +#define aom_smooth_h_predictor_8x32 aom_smooth_h_predictor_8x32_c void aom_smooth_h_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_8x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_8x4 aom_smooth_h_predictor_8x4_ssse3 +#define aom_smooth_h_predictor_8x4 aom_smooth_h_predictor_8x4_c void aom_smooth_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_h_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_h_predictor_8x8 aom_smooth_h_predictor_8x8_ssse3 +#define aom_smooth_h_predictor_8x8 aom_smooth_h_predictor_8x8_c void aom_smooth_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_16x16 aom_smooth_predictor_16x16_ssse3 +#define aom_smooth_predictor_16x16 aom_smooth_predictor_16x16_c void aom_smooth_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_16x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_16x32 aom_smooth_predictor_16x32_ssse3 +#define aom_smooth_predictor_16x32 aom_smooth_predictor_16x32_c void aom_smooth_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_16x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_16x4 aom_smooth_predictor_16x4_ssse3 +#define aom_smooth_predictor_16x4 aom_smooth_predictor_16x4_c void aom_smooth_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_16x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_16x64 aom_smooth_predictor_16x64_ssse3 +#define aom_smooth_predictor_16x64 aom_smooth_predictor_16x64_c void aom_smooth_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_16x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_16x8 aom_smooth_predictor_16x8_ssse3 +#define aom_smooth_predictor_16x8 aom_smooth_predictor_16x8_c void aom_smooth_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_smooth_predictor_2x2 aom_smooth_predictor_2x2_c void aom_smooth_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_32x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_32x16 aom_smooth_predictor_32x16_ssse3 +#define aom_smooth_predictor_32x16 aom_smooth_predictor_32x16_c void aom_smooth_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_32x32 aom_smooth_predictor_32x32_ssse3 +#define aom_smooth_predictor_32x32 aom_smooth_predictor_32x32_c void aom_smooth_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_32x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_32x64 aom_smooth_predictor_32x64_ssse3 +#define aom_smooth_predictor_32x64 aom_smooth_predictor_32x64_c void aom_smooth_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_32x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_32x8 aom_smooth_predictor_32x8_ssse3 +#define aom_smooth_predictor_32x8 aom_smooth_predictor_32x8_c void aom_smooth_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_4x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_4x16 aom_smooth_predictor_4x16_ssse3 +#define aom_smooth_predictor_4x16 aom_smooth_predictor_4x16_c void aom_smooth_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_4x4 aom_smooth_predictor_4x4_ssse3 +#define aom_smooth_predictor_4x4 aom_smooth_predictor_4x4_c void aom_smooth_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_4x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_4x8 aom_smooth_predictor_4x8_ssse3 +#define aom_smooth_predictor_4x8 aom_smooth_predictor_4x8_c void aom_smooth_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_64x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_64x16 aom_smooth_predictor_64x16_ssse3 +#define aom_smooth_predictor_64x16 aom_smooth_predictor_64x16_c void aom_smooth_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_64x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_64x32 aom_smooth_predictor_64x32_ssse3 +#define aom_smooth_predictor_64x32 aom_smooth_predictor_64x32_c void aom_smooth_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_64x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_64x64 aom_smooth_predictor_64x64_ssse3 +#define aom_smooth_predictor_64x64 aom_smooth_predictor_64x64_c void aom_smooth_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_8x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_8x16 aom_smooth_predictor_8x16_ssse3 +#define aom_smooth_predictor_8x16 aom_smooth_predictor_8x16_c void aom_smooth_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_8x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_8x32 aom_smooth_predictor_8x32_ssse3 +#define aom_smooth_predictor_8x32 aom_smooth_predictor_8x32_c void aom_smooth_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_8x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_8x4 aom_smooth_predictor_8x4_ssse3 +#define aom_smooth_predictor_8x4 aom_smooth_predictor_8x4_c void aom_smooth_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_predictor_8x8 aom_smooth_predictor_8x8_ssse3 +#define aom_smooth_predictor_8x8 aom_smooth_predictor_8x8_c void aom_smooth_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_16x16 aom_smooth_v_predictor_16x16_ssse3 +#define aom_smooth_v_predictor_16x16 aom_smooth_v_predictor_16x16_c void aom_smooth_v_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_16x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_16x32 aom_smooth_v_predictor_16x32_ssse3 +#define aom_smooth_v_predictor_16x32 aom_smooth_v_predictor_16x32_c void aom_smooth_v_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_16x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_16x4 aom_smooth_v_predictor_16x4_ssse3 +#define aom_smooth_v_predictor_16x4 aom_smooth_v_predictor_16x4_c void aom_smooth_v_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_16x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_16x64 aom_smooth_v_predictor_16x64_ssse3 +#define aom_smooth_v_predictor_16x64 aom_smooth_v_predictor_16x64_c void aom_smooth_v_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_16x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_16x8 aom_smooth_v_predictor_16x8_ssse3 +#define aom_smooth_v_predictor_16x8 aom_smooth_v_predictor_16x8_c void aom_smooth_v_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_smooth_v_predictor_2x2 aom_smooth_v_predictor_2x2_c void aom_smooth_v_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_32x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_32x16 aom_smooth_v_predictor_32x16_ssse3 +#define aom_smooth_v_predictor_32x16 aom_smooth_v_predictor_32x16_c void aom_smooth_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_32x32 aom_smooth_v_predictor_32x32_ssse3 +#define aom_smooth_v_predictor_32x32 aom_smooth_v_predictor_32x32_c void aom_smooth_v_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_32x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_32x64 aom_smooth_v_predictor_32x64_ssse3 +#define aom_smooth_v_predictor_32x64 aom_smooth_v_predictor_32x64_c void aom_smooth_v_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_32x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_32x8 aom_smooth_v_predictor_32x8_ssse3 +#define aom_smooth_v_predictor_32x8 aom_smooth_v_predictor_32x8_c void aom_smooth_v_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_4x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_4x16 aom_smooth_v_predictor_4x16_ssse3 +#define aom_smooth_v_predictor_4x16 aom_smooth_v_predictor_4x16_c void aom_smooth_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_4x4 aom_smooth_v_predictor_4x4_ssse3 +#define aom_smooth_v_predictor_4x4 aom_smooth_v_predictor_4x4_c void aom_smooth_v_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_4x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_4x8 aom_smooth_v_predictor_4x8_ssse3 +#define aom_smooth_v_predictor_4x8 aom_smooth_v_predictor_4x8_c void aom_smooth_v_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_64x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_64x16 aom_smooth_v_predictor_64x16_ssse3 +#define aom_smooth_v_predictor_64x16 aom_smooth_v_predictor_64x16_c void aom_smooth_v_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_64x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_64x32 aom_smooth_v_predictor_64x32_ssse3 +#define aom_smooth_v_predictor_64x32 aom_smooth_v_predictor_64x32_c void aom_smooth_v_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_64x64_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_64x64 aom_smooth_v_predictor_64x64_ssse3 +#define aom_smooth_v_predictor_64x64 aom_smooth_v_predictor_64x64_c void aom_smooth_v_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_8x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_8x16 aom_smooth_v_predictor_8x16_ssse3 +#define aom_smooth_v_predictor_8x16 aom_smooth_v_predictor_8x16_c void aom_smooth_v_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_8x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_8x32 aom_smooth_v_predictor_8x32_ssse3 +#define aom_smooth_v_predictor_8x32 aom_smooth_v_predictor_8x32_c void aom_smooth_v_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_8x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_8x4 aom_smooth_v_predictor_8x4_ssse3 +#define aom_smooth_v_predictor_8x4 aom_smooth_v_predictor_8x4_c void aom_smooth_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_smooth_v_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_smooth_v_predictor_8x8 aom_smooth_v_predictor_8x8_ssse3 +#define aom_smooth_v_predictor_8x8 aom_smooth_v_predictor_8x8_c void aom_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_16x16 aom_v_predictor_16x16_sse2 +#define aom_v_predictor_16x16 aom_v_predictor_16x16_c void aom_v_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_16x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_16x32 aom_v_predictor_16x32_sse2 +#define aom_v_predictor_16x32 aom_v_predictor_16x32_c void aom_v_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_16x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_16x4 aom_v_predictor_16x4_sse2 +#define aom_v_predictor_16x4 aom_v_predictor_16x4_c void aom_v_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_16x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_16x64 aom_v_predictor_16x64_sse2 +#define aom_v_predictor_16x64 aom_v_predictor_16x64_c void aom_v_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_16x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_16x8 aom_v_predictor_16x8_sse2 +#define aom_v_predictor_16x8 aom_v_predictor_16x8_c void aom_v_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_v_predictor_2x2 aom_v_predictor_2x2_c void aom_v_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_32x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_32x16 aom_v_predictor_32x16_sse2 +#define aom_v_predictor_32x16 aom_v_predictor_32x16_c void aom_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_32x32 aom_v_predictor_32x32_sse2 +#define aom_v_predictor_32x32 aom_v_predictor_32x32_c void aom_v_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_32x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_32x64 aom_v_predictor_32x64_sse2 +#define aom_v_predictor_32x64 aom_v_predictor_32x64_c void aom_v_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_32x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_32x8 aom_v_predictor_32x8_sse2 +#define aom_v_predictor_32x8 aom_v_predictor_32x8_c void aom_v_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_4x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_4x16 aom_v_predictor_4x16_sse2 +#define aom_v_predictor_4x16 aom_v_predictor_4x16_c void aom_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_4x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_4x4 aom_v_predictor_4x4_sse2 +#define aom_v_predictor_4x4 aom_v_predictor_4x4_c void aom_v_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_4x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_4x8 aom_v_predictor_4x8_sse2 +#define aom_v_predictor_4x8 aom_v_predictor_4x8_c void aom_v_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_64x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_64x16 aom_v_predictor_64x16_sse2 +#define aom_v_predictor_64x16 aom_v_predictor_64x16_c void aom_v_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_64x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_64x32 aom_v_predictor_64x32_sse2 +#define aom_v_predictor_64x32 aom_v_predictor_64x32_c void aom_v_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_64x64_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_64x64 aom_v_predictor_64x64_sse2 +#define aom_v_predictor_64x64 aom_v_predictor_64x64_c void aom_v_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_8x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_8x16 aom_v_predictor_8x16_sse2 +#define aom_v_predictor_8x16 aom_v_predictor_8x16_c void aom_v_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_8x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_8x32 aom_v_predictor_8x32_sse2 +#define aom_v_predictor_8x32 aom_v_predictor_8x32_c void aom_v_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_8x4_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_8x4 aom_v_predictor_8x4_sse2 +#define aom_v_predictor_8x4 aom_v_predictor_8x4_c void aom_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -void aom_v_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define aom_v_predictor_8x8 aom_v_predictor_8x8_sse2 +#define aom_v_predictor_8x8 aom_v_predictor_8x8_c void av1_round_shift_array_c(int32_t *arr, int size, int bit); #define av1_round_shift_array av1_round_shift_array_c diff --git a/config/x86/config/av1_rtcd.h b/config/x86/config/av1_rtcd.h index c5d7794..5e47963 100644 --- a/config/x86/config/av1_rtcd.h +++ b/config/x86/config/av1_rtcd.h @@ -63,30 +63,25 @@ void av1_build_compound_diffwtd_mask_d16_c(uint8_t *mask, DIFFWTD_MASK_TYPE mask #define av1_build_compound_diffwtd_mask_d16 av1_build_compound_diffwtd_mask_d16_c void av1_build_compound_diffwtd_mask_highbd_c(uint8_t *mask, DIFFWTD_MASK_TYPE mask_type, const uint8_t *src0, int src0_stride, const uint8_t *src1, int src1_stride, int h, int w, int bd); -void av1_build_compound_diffwtd_mask_highbd_ssse3(uint8_t *mask, DIFFWTD_MASK_TYPE mask_type, const uint8_t *src0, int src0_stride, const uint8_t *src1, int src1_stride, int h, int w, int bd); -#define av1_build_compound_diffwtd_mask_highbd av1_build_compound_diffwtd_mask_highbd_ssse3 +#define av1_build_compound_diffwtd_mask_highbd av1_build_compound_diffwtd_mask_highbd_c void av1_convolve_2d_copy_sr_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -void av1_convolve_2d_copy_sr_sse2(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -#define av1_convolve_2d_copy_sr av1_convolve_2d_copy_sr_sse2 +#define av1_convolve_2d_copy_sr av1_convolve_2d_copy_sr_c void av1_convolve_2d_scale_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_qn, const int x_step_qn, const int subpel_y_q4, const int y_step_qn, ConvolveParams *conv_params); #define av1_convolve_2d_scale av1_convolve_2d_scale_c void av1_convolve_2d_sr_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -void av1_convolve_2d_sr_sse2(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -#define av1_convolve_2d_sr av1_convolve_2d_sr_sse2 +#define av1_convolve_2d_sr av1_convolve_2d_sr_c void av1_convolve_horiz_rs_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const int16_t *x_filters, int x0_qn, int x_step_qn); #define av1_convolve_horiz_rs av1_convolve_horiz_rs_c void av1_convolve_x_sr_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -void av1_convolve_x_sr_sse2(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -#define av1_convolve_x_sr av1_convolve_x_sr_sse2 +#define av1_convolve_x_sr av1_convolve_x_sr_c void av1_convolve_y_sr_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -void av1_convolve_y_sr_sse2(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -#define av1_convolve_y_sr av1_convolve_y_sr_sse2 +#define av1_convolve_y_sr av1_convolve_y_sr_c void av1_dr_prediction_z1_c(uint8_t *dst, ptrdiff_t stride, int bw, int bh, const uint8_t *above, const uint8_t *left, int upsample_above, int dx, int dy); #define av1_dr_prediction_z1 av1_dr_prediction_z1_c @@ -116,15 +111,13 @@ void av1_highbd_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8 #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c void av1_highbd_convolve_2d_copy_sr_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params, int bd); -void av1_highbd_convolve_2d_copy_sr_sse2(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params, int bd); -#define av1_highbd_convolve_2d_copy_sr av1_highbd_convolve_2d_copy_sr_sse2 +#define av1_highbd_convolve_2d_copy_sr av1_highbd_convolve_2d_copy_sr_c void av1_highbd_convolve_2d_scale_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int x_step_qn, const int subpel_y_q4, const int y_step_qn, ConvolveParams *conv_params, int bd); #define av1_highbd_convolve_2d_scale av1_highbd_convolve_2d_scale_c void av1_highbd_convolve_2d_sr_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params, int bd); -void av1_highbd_convolve_2d_sr_ssse3(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params, int bd); -#define av1_highbd_convolve_2d_sr av1_highbd_convolve_2d_sr_ssse3 +#define av1_highbd_convolve_2d_sr av1_highbd_convolve_2d_sr_c void av1_highbd_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); #define av1_highbd_convolve_avg av1_highbd_convolve_avg_c @@ -136,12 +129,10 @@ void av1_highbd_convolve_horiz_rs_c(const uint16_t *src, int src_stride, uint16_ #define av1_highbd_convolve_horiz_rs av1_highbd_convolve_horiz_rs_c void av1_highbd_convolve_x_sr_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params, int bd); -void av1_highbd_convolve_x_sr_ssse3(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params, int bd); -#define av1_highbd_convolve_x_sr av1_highbd_convolve_x_sr_ssse3 +#define av1_highbd_convolve_x_sr av1_highbd_convolve_x_sr_c void av1_highbd_convolve_y_sr_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params, int bd); -void av1_highbd_convolve_y_sr_ssse3(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params, int bd); -#define av1_highbd_convolve_y_sr av1_highbd_convolve_y_sr_ssse3 +#define av1_highbd_convolve_y_sr av1_highbd_convolve_y_sr_c void av1_highbd_dr_prediction_z1_c(uint16_t *dst, ptrdiff_t stride, int bw, int bh, const uint16_t *above, const uint16_t *left, int upsample_above, int dx, int dy, int bd); #define av1_highbd_dr_prediction_z1 av1_highbd_dr_prediction_z1_c @@ -219,8 +210,7 @@ void av1_highbd_warp_affine_c(const int32_t *mat, const uint16_t *ref, int width #define av1_highbd_warp_affine av1_highbd_warp_affine_c void av1_highbd_wiener_convolve_add_src_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, const ConvolveParams *conv_params, int bps); -void av1_highbd_wiener_convolve_add_src_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, const ConvolveParams *conv_params, int bps); -#define av1_highbd_wiener_convolve_add_src av1_highbd_wiener_convolve_add_src_ssse3 +#define av1_highbd_wiener_convolve_add_src av1_highbd_wiener_convolve_add_src_c void av1_inv_txfm2d_add_16x16_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_inv_txfm2d_add_16x16 av1_inv_txfm2d_add_16x16_c @@ -280,25 +270,19 @@ void av1_inv_txfm2d_add_8x8_c(const int32_t *input, uint16_t *output, int stride #define av1_inv_txfm2d_add_8x8 av1_inv_txfm2d_add_8x8_c void av1_inv_txfm_add_c(const tran_low_t *dqcoeff, uint8_t *dst, int stride, const TxfmParam *txfm_param); -void av1_inv_txfm_add_ssse3(const tran_low_t *dqcoeff, uint8_t *dst, int stride, const TxfmParam *txfm_param); -#define av1_inv_txfm_add av1_inv_txfm_add_ssse3 +#define av1_inv_txfm_add av1_inv_txfm_add_c void av1_jnt_convolve_2d_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -void av1_jnt_convolve_2d_sse2(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -void av1_jnt_convolve_2d_ssse3(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -#define av1_jnt_convolve_2d av1_jnt_convolve_2d_ssse3 +#define av1_jnt_convolve_2d av1_jnt_convolve_2d_c void av1_jnt_convolve_2d_copy_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -void av1_jnt_convolve_2d_copy_sse2(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -#define av1_jnt_convolve_2d_copy av1_jnt_convolve_2d_copy_sse2 +#define av1_jnt_convolve_2d_copy av1_jnt_convolve_2d_copy_c void av1_jnt_convolve_x_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -void av1_jnt_convolve_x_sse2(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -#define av1_jnt_convolve_x av1_jnt_convolve_x_sse2 +#define av1_jnt_convolve_x av1_jnt_convolve_x_c void av1_jnt_convolve_y_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -void av1_jnt_convolve_y_sse2(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -#define av1_jnt_convolve_y av1_jnt_convolve_y_sse2 +#define av1_jnt_convolve_y av1_jnt_convolve_y_c int av1_selfguided_restoration_c(const uint8_t *dgd8, int width, int height, int dgd_stride, int32_t *flt0, int32_t *flt1, int flt_stride, @@ -315,64 +299,46 @@ void av1_warp_affine_c(const int32_t *mat, const uint8_t *ref, int width, int he #define av1_warp_affine av1_warp_affine_c void av1_wiener_convolve_add_src_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, const ConvolveParams *conv_params); -void av1_wiener_convolve_add_src_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, const ConvolveParams *conv_params); -#define av1_wiener_convolve_add_src av1_wiener_convolve_add_src_sse2 +#define av1_wiener_convolve_add_src av1_wiener_convolve_add_src_c void cdef_filter_block_c(uint8_t *dst8, uint16_t *dst16, int dstride, const uint16_t *in, int pri_strength, int sec_strength, int dir, int pri_damping, int sec_damping, int bsize, int coeff_shift); -void cdef_filter_block_sse2(uint8_t *dst8, uint16_t *dst16, int dstride, const uint16_t *in, int pri_strength, int sec_strength, int dir, int pri_damping, int sec_damping, int bsize, int coeff_shift); -void cdef_filter_block_ssse3(uint8_t *dst8, uint16_t *dst16, int dstride, const uint16_t *in, int pri_strength, int sec_strength, int dir, int pri_damping, int sec_damping, int bsize, int coeff_shift); -#define cdef_filter_block cdef_filter_block_ssse3 +#define cdef_filter_block cdef_filter_block_c int cdef_find_dir_c(const uint16_t *img, int stride, int32_t *var, int coeff_shift); -int cdef_find_dir_sse2(const uint16_t *img, int stride, int32_t *var, int coeff_shift); -int cdef_find_dir_ssse3(const uint16_t *img, int stride, int32_t *var, int coeff_shift); -#define cdef_find_dir cdef_find_dir_ssse3 +#define cdef_find_dir cdef_find_dir_c cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size); -cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_ssse3(TX_SIZE tx_size); -#define cfl_get_luma_subsampling_420_hbd cfl_get_luma_subsampling_420_hbd_ssse3 +#define cfl_get_luma_subsampling_420_hbd cfl_get_luma_subsampling_420_hbd_c cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size); -cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_ssse3(TX_SIZE tx_size); -#define cfl_get_luma_subsampling_420_lbd cfl_get_luma_subsampling_420_lbd_ssse3 +#define cfl_get_luma_subsampling_420_lbd cfl_get_luma_subsampling_420_lbd_c cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size); -cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_ssse3(TX_SIZE tx_size); -#define cfl_get_luma_subsampling_422_hbd cfl_get_luma_subsampling_422_hbd_ssse3 +#define cfl_get_luma_subsampling_422_hbd cfl_get_luma_subsampling_422_hbd_c cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size); -cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_ssse3(TX_SIZE tx_size); -#define cfl_get_luma_subsampling_422_lbd cfl_get_luma_subsampling_422_lbd_ssse3 +#define cfl_get_luma_subsampling_422_lbd cfl_get_luma_subsampling_422_lbd_c cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size); -cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_ssse3(TX_SIZE tx_size); -#define cfl_get_luma_subsampling_444_hbd cfl_get_luma_subsampling_444_hbd_ssse3 +#define cfl_get_luma_subsampling_444_hbd cfl_get_luma_subsampling_444_hbd_c cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size); -cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_ssse3(TX_SIZE tx_size); -#define cfl_get_luma_subsampling_444_lbd cfl_get_luma_subsampling_444_lbd_ssse3 +#define cfl_get_luma_subsampling_444_lbd cfl_get_luma_subsampling_444_lbd_c void copy_rect8_16bit_to_16bit_c(uint16_t *dst, int dstride, const uint16_t *src, int sstride, int v, int h); -void copy_rect8_16bit_to_16bit_sse2(uint16_t *dst, int dstride, const uint16_t *src, int sstride, int v, int h); -void copy_rect8_16bit_to_16bit_ssse3(uint16_t *dst, int dstride, const uint16_t *src, int sstride, int v, int h); -#define copy_rect8_16bit_to_16bit copy_rect8_16bit_to_16bit_ssse3 +#define copy_rect8_16bit_to_16bit copy_rect8_16bit_to_16bit_c void copy_rect8_8bit_to_16bit_c(uint16_t *dst, int dstride, const uint8_t *src, int sstride, int v, int h); -void copy_rect8_8bit_to_16bit_sse2(uint16_t *dst, int dstride, const uint8_t *src, int sstride, int v, int h); -void copy_rect8_8bit_to_16bit_ssse3(uint16_t *dst, int dstride, const uint8_t *src, int sstride, int v, int h); -#define copy_rect8_8bit_to_16bit copy_rect8_8bit_to_16bit_ssse3 +#define copy_rect8_8bit_to_16bit copy_rect8_8bit_to_16bit_c cfl_predict_hbd_fn get_predict_hbd_fn_c(TX_SIZE tx_size); -cfl_predict_hbd_fn get_predict_hbd_fn_ssse3(TX_SIZE tx_size); -#define get_predict_hbd_fn get_predict_hbd_fn_ssse3 +#define get_predict_hbd_fn get_predict_hbd_fn_c cfl_predict_lbd_fn get_predict_lbd_fn_c(TX_SIZE tx_size); -cfl_predict_lbd_fn get_predict_lbd_fn_ssse3(TX_SIZE tx_size); -#define get_predict_lbd_fn get_predict_lbd_fn_ssse3 +#define get_predict_lbd_fn get_predict_lbd_fn_c cfl_subtract_average_fn get_subtract_average_fn_c(TX_SIZE tx_size); -cfl_subtract_average_fn get_subtract_average_fn_sse2(TX_SIZE tx_size); -#define get_subtract_average_fn get_subtract_average_fn_sse2 +#define get_subtract_average_fn get_subtract_average_fn_c void av1_rtcd(void); diff --git a/generate_config.sh b/generate_config.sh index f5f92ad..333dd03 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -126,7 +126,8 @@ all_platforms+=" -DCONFIG_RUNTIME_CPU_DETECT=0" toolchain="-DCMAKE_TOOLCHAIN_FILE=${SRC}/build/cmake/toolchains" reset_dirs x86 -gen_config_files x86 "${toolchain}/x86-linux.cmake ${all_platforms}" +# Temporarily disable all x86 optimizations due to a build error with PIC +gen_config_files x86 "${toolchain}/x86-linux.cmake ${all_platforms} -DENABLE_SSE2=0" # libaom_srcs.gni and aom_version.h are shared. cp libaom_srcs.gni "${BASE}" |