diff options
| author | Johann <johannkoenig@google.com> | 2018-12-20 19:56:45 +0000 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2018-12-20 20:06:43 +0000 |
| commit | 22c2bd3e06135a97622059052ed68ebe0a9d90eb (patch) | |
| tree | 8880d0e4d9aae3af8340a2043026797c8ac1d1aa /vpx_dsp | |
| parent | 03a54576711c907648647fc2ef120aee0e2be0f6 (diff) | |
| download | libvpx-22c2bd3e06135a97622059052ed68ebe0a9d90eb.tar libvpx-22c2bd3e06135a97622059052ed68ebe0a9d90eb.tar.gz libvpx-22c2bd3e06135a97622059052ed68ebe0a9d90eb.tar.bz2 libvpx-22c2bd3e06135a97622059052ed68ebe0a9d90eb.zip | |
highbd variance: resolve missing declarations
The optimizations were accidentally disabled during the move from vp9
commit c3bdffb0a508ad08d5dfa613c029f368d4293d4c
author Johann <johannkoenig@google.com> Fri May 15 18:52:03 2015
Move variance functions to vpx_dsp
subpel functions will be moved in another patch.
BUG=webm:1584
Change-Id: Ia7899ee0cfad13a0e1516b89756552064846e81c
Diffstat (limited to 'vpx_dsp')
| -rw-r--r-- | vpx_dsp/vpx_dsp_rtcd_defs.pl | 9 | ||||
| -rw-r--r-- | vpx_dsp/x86/highbd_variance_sse2.c | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/vpx_dsp/vpx_dsp_rtcd_defs.pl b/vpx_dsp/vpx_dsp_rtcd_defs.pl index 7e2d922ab..4b5e3d501 100644 --- a/vpx_dsp/vpx_dsp_rtcd_defs.pl +++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl @@ -1357,13 +1357,22 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { add_proto qw/unsigned int vpx_highbd_8_variance4x4/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"; add_proto qw/void vpx_highbd_8_get16x16var/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum"; + specialize qw/vpx_highbd_8_get16x16var sse2/; + add_proto qw/void vpx_highbd_8_get8x8var/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum"; + specialize qw/vpx_highbd_8_get8x8var sse2/; add_proto qw/void vpx_highbd_10_get16x16var/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum"; + specialize qw/vpx_highbd_10_get16x16var sse2/; + add_proto qw/void vpx_highbd_10_get8x8var/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum"; + specialize qw/vpx_highbd_10_get8x8var sse2/; add_proto qw/void vpx_highbd_12_get16x16var/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum"; + specialize qw/vpx_highbd_12_get16x16var sse2/; + add_proto qw/void vpx_highbd_12_get8x8var/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum"; + specialize qw/vpx_highbd_12_get8x8var sse2/; add_proto qw/unsigned int vpx_highbd_8_mse16x16/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"; specialize qw/vpx_highbd_8_mse16x16 sse2/; diff --git a/vpx_dsp/x86/highbd_variance_sse2.c b/vpx_dsp/x86/highbd_variance_sse2.c index d08da1c67..cc4e260df 100644 --- a/vpx_dsp/x86/highbd_variance_sse2.c +++ b/vpx_dsp/x86/highbd_variance_sse2.c @@ -7,8 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "./vpx_config.h" +#include "./vpx_config.h" +#include "./vpx_dsp_rtcd.h" #include "vpx_ports/mem.h" typedef uint32_t (*high_variance_fn_t)(const uint16_t *src, int src_stride, @@ -89,9 +90,9 @@ static void highbd_12_variance_sse2(const uint16_t *src, int src_stride, } #define HIGH_GET_VAR(S) \ - void vpx_highbd_get##S##x##S##var_sse2(const uint8_t *src8, int src_stride, \ - const uint8_t *ref8, int ref_stride, \ - uint32_t *sse, int *sum) { \ + void vpx_highbd_8_get##S##x##S##var_sse2( \ + const uint8_t *src8, int src_stride, const uint8_t *ref8, \ + int ref_stride, uint32_t *sse, int *sum) { \ uint16_t *src = CONVERT_TO_SHORTPTR(src8); \ uint16_t *ref = CONVERT_TO_SHORTPTR(ref8); \ vpx_highbd_calc##S##x##S##var_sse2(src, src_stride, ref, ref_stride, sse, \ |