diff options
-rw-r--r-- | vp9/common/vp9_rtcd_defs.pl | 2 | ||||
-rw-r--r-- | vp9/common/x86/vp9_idct_intrin_sse2.c | 1 | ||||
-rw-r--r-- | vp9/common/x86/vp9_loopfilter_intrin_avx2.c | 2 | ||||
-rw-r--r-- | vp9/common/x86/vp9_loopfilter_intrin_sse2.c | 2 | ||||
-rw-r--r-- | vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_avg.c | 1 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_avg_intrin_sse2.c | 2 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_dct32x32_avx2.c | 2 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_dct32x32_sse2.c | 2 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_dct_impl_sse2.c | 2 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_dct_sse2.c | 4 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_dct_ssse3.c | 2 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_error_intrin_avx2.c | 3 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_quantize_sse2.c | 1 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_subpel_variance_impl_intrin_avx2.c | 2 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_variance_avx2.c | 1 | ||||
-rw-r--r-- | vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c | 2 |
17 files changed, 30 insertions, 3 deletions
diff --git a/vp9/common/vp9_rtcd_defs.pl b/vp9/common/vp9_rtcd_defs.pl index c8169fd3b..2a9736b40 100644 --- a/vp9/common/vp9_rtcd_defs.pl +++ b/vp9/common/vp9_rtcd_defs.pl @@ -969,7 +969,7 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { specialize qw/vp9_highbd_avg_8x8/; add_proto qw/unsigned int vp9_highbd_avg_4x4/, "const uint8_t *, int p"; specialize qw/vp9_highbd_avg_4x4/; - add_proto qw/unsigned int vp9_highbd_minmax_8x8/, "const uint8_t *s, int p, const uint8_t *d, int dp, int *min, int *max"; + add_proto qw/void vp9_highbd_minmax_8x8/, "const uint8_t *s, int p, const uint8_t *d, int dp, int *min, int *max"; specialize qw/vp9_highbd_minmax_8x8/; } diff --git a/vp9/common/x86/vp9_idct_intrin_sse2.c b/vp9/common/x86/vp9_idct_intrin_sse2.c index 6ad7c6294..52d21be4a 100644 --- a/vp9/common/x86/vp9_idct_intrin_sse2.c +++ b/vp9/common/x86/vp9_idct_intrin_sse2.c @@ -8,6 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "./vp9_rtcd.h" #include "vpx_ports/mem.h" #include "vp9/common/x86/vp9_idct_intrin_sse2.h" #include "vp9/common/vp9_idct.h" diff --git a/vp9/common/x86/vp9_loopfilter_intrin_avx2.c b/vp9/common/x86/vp9_loopfilter_intrin_avx2.c index 0cb0912ad..770a65f4c 100644 --- a/vp9/common/x86/vp9_loopfilter_intrin_avx2.c +++ b/vp9/common/x86/vp9_loopfilter_intrin_avx2.c @@ -9,6 +9,8 @@ */ #include <immintrin.h> /* AVX2 */ + +#include "./vp9_rtcd.h" #include "vpx_ports/mem.h" static void mb_lpf_horizontal_edge_w_avx2_8(unsigned char *s, int p, diff --git a/vp9/common/x86/vp9_loopfilter_intrin_sse2.c b/vp9/common/x86/vp9_loopfilter_intrin_sse2.c index 8723d3283..e321dbebe 100644 --- a/vp9/common/x86/vp9_loopfilter_intrin_sse2.c +++ b/vp9/common/x86/vp9_loopfilter_intrin_sse2.c @@ -9,6 +9,8 @@ */ #include <emmintrin.h> // SSE2 + +#include "./vp9_rtcd.h" #include "vp9/common/vp9_loopfilter.h" #include "vpx_ports/emmintrin_compat.h" diff --git a/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c b/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c index 71dbb402d..4ab49e772 100644 --- a/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c +++ b/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c @@ -9,6 +9,8 @@ */ #include <tmmintrin.h> + +#include "./vp9_rtcd.h" #include "vpx_ports/mem.h" #include "vpx_ports/emmintrin_compat.h" diff --git a/vp9/encoder/vp9_avg.c b/vp9/encoder/vp9_avg.c index 95b13bb77..b9987c1ce 100644 --- a/vp9/encoder/vp9_avg.c +++ b/vp9/encoder/vp9_avg.c @@ -7,6 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ +#include "./vp9_rtcd.h" #include "vp9/common/vp9_common.h" #include "vpx_ports/mem.h" diff --git a/vp9/encoder/x86/vp9_avg_intrin_sse2.c b/vp9/encoder/x86/vp9_avg_intrin_sse2.c index 4672aa6b8..56a91ed2d 100644 --- a/vp9/encoder/x86/vp9_avg_intrin_sse2.c +++ b/vp9/encoder/x86/vp9_avg_intrin_sse2.c @@ -9,6 +9,8 @@ */ #include <emmintrin.h> + +#include "./vp9_rtcd.h" #include "vpx_ports/mem.h" void vp9_minmax_8x8_sse2(const uint8_t *s, int p, const uint8_t *d, int dp, diff --git a/vp9/encoder/x86/vp9_dct32x32_avx2.c b/vp9/encoder/x86/vp9_dct32x32_avx2.c index 66827ad80..ae6bfe5fa 100644 --- a/vp9/encoder/x86/vp9_dct32x32_avx2.c +++ b/vp9/encoder/x86/vp9_dct32x32_avx2.c @@ -9,6 +9,8 @@ */ #include <immintrin.h> // AVX2 + +#include "./vp9_rtcd.h" #include "vp9/common/vp9_idct.h" // for cospi constants #include "vpx_ports/mem.h" diff --git a/vp9/encoder/x86/vp9_dct32x32_sse2.c b/vp9/encoder/x86/vp9_dct32x32_sse2.c index 099993aa6..003ebd13f 100644 --- a/vp9/encoder/x86/vp9_dct32x32_sse2.c +++ b/vp9/encoder/x86/vp9_dct32x32_sse2.c @@ -9,6 +9,8 @@ */ #include <emmintrin.h> // SSE2 + +#include "./vp9_rtcd.h" #include "vp9/common/vp9_idct.h" // for cospi constants #include "vp9/encoder/x86/vp9_dct_sse2.h" #include "vp9/encoder/vp9_dct.h" diff --git a/vp9/encoder/x86/vp9_dct_impl_sse2.c b/vp9/encoder/x86/vp9_dct_impl_sse2.c index e03a76d2e..11bf5a25e 100644 --- a/vp9/encoder/x86/vp9_dct_impl_sse2.c +++ b/vp9/encoder/x86/vp9_dct_impl_sse2.c @@ -9,6 +9,8 @@ */ #include <emmintrin.h> // SSE2 + +#include "./vp9_rtcd.h" #include "vp9/common/vp9_idct.h" // for cospi constants #include "vp9/encoder/vp9_dct.h" #include "vp9/encoder/x86/vp9_dct_sse2.h" diff --git a/vp9/encoder/x86/vp9_dct_sse2.c b/vp9/encoder/x86/vp9_dct_sse2.c index fb04aece0..6d1f52a00 100644 --- a/vp9/encoder/x86/vp9_dct_sse2.c +++ b/vp9/encoder/x86/vp9_dct_sse2.c @@ -10,6 +10,8 @@ #include <assert.h> #include <emmintrin.h> // SSE2 + +#include "./vp9_rtcd.h" #include "vp9/common/vp9_idct.h" // for cospi constants #include "vp9/encoder/vp9_dct.h" #include "vp9/encoder/x86/vp9_dct_sse2.h" @@ -2334,7 +2336,7 @@ void vp9_highbd_fht8x8_sse2(const int16_t *input, tran_low_t *output, } } -void vp9_highbd_fht16x16_sse2(int16_t *input, tran_low_t *output, +void vp9_highbd_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type) { if (tx_type == DCT_DCT) { vp9_highbd_fdct16x16_sse2(input, output, stride); diff --git a/vp9/encoder/x86/vp9_dct_ssse3.c b/vp9/encoder/x86/vp9_dct_ssse3.c index 1c1005aee..96038fee1 100644 --- a/vp9/encoder/x86/vp9_dct_ssse3.c +++ b/vp9/encoder/x86/vp9_dct_ssse3.c @@ -15,6 +15,8 @@ #include <math.h> #endif #include <tmmintrin.h> // SSSE3 + +#include "./vp9_rtcd.h" #include "vp9/common/x86/vp9_idct_intrin_sse2.h" void vp9_fdct8x8_quant_ssse3(const int16_t *input, int stride, diff --git a/vp9/encoder/x86/vp9_error_intrin_avx2.c b/vp9/encoder/x86/vp9_error_intrin_avx2.c index c67490fad..dfebaab0a 100644 --- a/vp9/encoder/x86/vp9_error_intrin_avx2.c +++ b/vp9/encoder/x86/vp9_error_intrin_avx2.c @@ -9,8 +9,9 @@ */ #include <immintrin.h> // AVX2 -#include "vpx/vpx_integer.h" +#include "./vp9_rtcd.h" +#include "vpx/vpx_integer.h" int64_t vp9_block_error_avx2(const int16_t *coeff, const int16_t *dqcoeff, diff --git a/vp9/encoder/x86/vp9_quantize_sse2.c b/vp9/encoder/x86/vp9_quantize_sse2.c index 00abd3c49..71fdfd716 100644 --- a/vp9/encoder/x86/vp9_quantize_sse2.c +++ b/vp9/encoder/x86/vp9_quantize_sse2.c @@ -11,6 +11,7 @@ #include <emmintrin.h> #include <xmmintrin.h> +#include "./vp9_rtcd.h" #include "vpx/vpx_integer.h" void vp9_quantize_b_sse2(const int16_t* coeff_ptr, intptr_t n_coeffs, diff --git a/vp9/encoder/x86/vp9_subpel_variance_impl_intrin_avx2.c b/vp9/encoder/x86/vp9_subpel_variance_impl_intrin_avx2.c index a441cadaf..19ac5c0df 100644 --- a/vp9/encoder/x86/vp9_subpel_variance_impl_intrin_avx2.c +++ b/vp9/encoder/x86/vp9_subpel_variance_impl_intrin_avx2.c @@ -9,6 +9,8 @@ */ #include <immintrin.h> // AVX2 + +#include "./vp9_rtcd.h" #include "vpx_ports/mem.h" #include "vp9/encoder/vp9_variance.h" diff --git a/vp9/encoder/x86/vp9_variance_avx2.c b/vp9/encoder/x86/vp9_variance_avx2.c index ea09b959e..ff9f7cca3 100644 --- a/vp9/encoder/x86/vp9_variance_avx2.c +++ b/vp9/encoder/x86/vp9_variance_avx2.c @@ -7,6 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ +#include "./vp9_rtcd.h" #include "./vpx_config.h" #include "vp9/encoder/vp9_variance.h" diff --git a/vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c b/vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c index f9923280a..ee76a315f 100644 --- a/vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c +++ b/vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c @@ -10,6 +10,8 @@ #include <immintrin.h> // AVX2 +#include "./vp9_rtcd.h" + void vp9_get16x16var_avx2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, |