shithub: libvpx

Info  •  Files  •  Log  •  Branches

vp9 intrinsics: add vp9_rtcd include

silences a missing declaration warning

Change-Id: I59a34e1a1377cf3529b678d7ec0122bd43ab1bf1

--- a/vp9/common/vp9_rtcd_defs.pl

+++ b/vp9/common/vp9_rtcd_defs.pl

@@ -969,7 +969,7 @@

   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/;

 }

--- 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"

--- 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,

--- 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"

--- 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"

--- 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"

--- 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,

--- 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"

--- 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"

--- 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"

--- 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_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);

--- 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,

--- 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,

--- 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,

--- 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"

--- 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"

--- 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,