diff options
| author | Johann Koenig <johannkoenig@google.com> | 2019-01-16 05:06:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-16 05:06:59 +0000 |
| commit | 9ecc0e779a29281e5698451bfd1b3ebe8f053bfd (patch) | |
| tree | bea01e8ce3d01a14e033360a9534394eeea7dd06 | |
| parent | 6e318fa569577525008be3263aa7032133c1b152 (diff) | |
| parent | 9ca2ec2277e55be333be59f9e6928d944fc2e2d5 (diff) | |
| download | libvpx-9ecc0e779a29281e5698451bfd1b3ebe8f053bfd.tar libvpx-9ecc0e779a29281e5698451bfd1b3ebe8f053bfd.tar.gz libvpx-9ecc0e779a29281e5698451bfd1b3ebe8f053bfd.tar.bz2 libvpx-9ecc0e779a29281e5698451bfd1b3ebe8f053bfd.zip | |
Merge "mips highbd: resolve missing declarations"
| -rw-r--r-- | vp9/encoder/mips/msa/vp9_error_msa.c | 3 | ||||
| -rw-r--r-- | vpx_dsp/mips/avg_msa.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/vp9/encoder/mips/msa/vp9_error_msa.c b/vp9/encoder/mips/msa/vp9_error_msa.c index 188d04d8f..61786d8f6 100644 --- a/vp9/encoder/mips/msa/vp9_error_msa.c +++ b/vp9/encoder/mips/msa/vp9_error_msa.c @@ -8,6 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "./vpx_config.h" #include "./vp9_rtcd.h" #include "vpx_dsp/mips/macros_msa.h" @@ -79,6 +80,7 @@ return err; \ } +#if !CONFIG_VP9_HIGHBITDEPTH BLOCK_ERROR_BLOCKSIZE_MSA(16); BLOCK_ERROR_BLOCKSIZE_MSA(64); BLOCK_ERROR_BLOCKSIZE_MSA(256); @@ -103,3 +105,4 @@ int64_t vp9_block_error_msa(const tran_low_t *coeff_ptr, return err; } +#endif // !CONFIG_VP9_HIGHBITDEPTH diff --git a/vpx_dsp/mips/avg_msa.c b/vpx_dsp/mips/avg_msa.c index d0ac7b8e2..3fd18dec5 100644 --- a/vpx_dsp/mips/avg_msa.c +++ b/vpx_dsp/mips/avg_msa.c @@ -9,6 +9,7 @@ */ #include <stdlib.h> +#include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" #include "vpx_dsp/mips/macros_msa.h" @@ -56,6 +57,7 @@ uint32_t vpx_avg_4x4_msa(const uint8_t *src, int32_t src_stride) { return sum_out; } +#if !CONFIG_VP9_HIGHBITDEPTH void vpx_hadamard_8x8_msa(const int16_t *src, ptrdiff_t src_stride, int16_t *dst) { v8i16 src0, src1, src2, src3, src4, src5, src6, src7; @@ -391,6 +393,7 @@ int vpx_satd_msa(const int16_t *data, int length) { return satd; } +#endif // !CONFIG_VP9_HIGHBITDEPTH void vpx_int_pro_row_msa(int16_t hbuf[16], const uint8_t *ref, const int ref_stride, const int height) { |