diff options
| author | Johann <johannkoenig@google.com> | 2015-05-13 19:47:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-13 19:47:24 +0000 |
| commit | cafae5b544fe19831e6e710056fb9eaa73e8b46b (patch) | |
| tree | 01fb3416b5e2a8c0a30f5736d4743ac5bdc71393 /test | |
| parent | 3007db0b456779cf0ab926f875c1723e77aeba20 (diff) | |
| parent | 1d7ccd5325ec34244074419f6802640c8afafd31 (diff) | |
| download | libvpx-cafae5b544fe19831e6e710056fb9eaa73e8b46b.tar libvpx-cafae5b544fe19831e6e710056fb9eaa73e8b46b.tar.gz libvpx-cafae5b544fe19831e6e710056fb9eaa73e8b46b.tar.bz2 libvpx-cafae5b544fe19831e6e710056fb9eaa73e8b46b.zip | |
Merge "Relocate memory operations for common code"
Diffstat (limited to 'test')
| -rw-r--r-- | test/dct16x16_test.cc | 1 | ||||
| -rw-r--r-- | test/dct32x32_test.cc | 1 | ||||
| -rw-r--r-- | test/fdct4x4_test.cc | 1 | ||||
| -rw-r--r-- | test/fdct8x8_test.cc | 1 | ||||
| -rw-r--r-- | test/sad_test.cc | 17 | ||||
| -rw-r--r-- | test/variance_test.cc | 1 |
6 files changed, 6 insertions, 16 deletions
diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc index 587b27ac8..48a8006af 100644 --- a/test/dct16x16_test.cc +++ b/test/dct16x16_test.cc @@ -22,6 +22,7 @@ #include "vp9/common/vp9_entropy.h" #include "vpx/vpx_codec.h" #include "vpx/vpx_integer.h" +#include "vpx_ports/mem.h" using libvpx_test::ACMRandom; diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index a96266188..267dfb85d 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc @@ -23,6 +23,7 @@ #include "vp9/common/vp9_entropy.h" #include "vpx/vpx_codec.h" #include "vpx/vpx_integer.h" +#include "vpx_ports/mem.h" using libvpx_test::ACMRandom; diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc index 610dbd44c..064a5a6c9 100644 --- a/test/fdct4x4_test.cc +++ b/test/fdct4x4_test.cc @@ -22,6 +22,7 @@ #include "vp9/common/vp9_entropy.h" #include "vpx/vpx_codec.h" #include "vpx/vpx_integer.h" +#include "vpx_ports/mem.h" using libvpx_test::ACMRandom; diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc index 8e9e3d8e2..4679516f4 100644 --- a/test/fdct8x8_test.cc +++ b/test/fdct8x8_test.cc @@ -22,6 +22,7 @@ #include "vp9/common/vp9_entropy.h" #include "vpx/vpx_codec.h" #include "vpx/vpx_integer.h" +#include "vpx_ports/mem.h" const int kNumCoeffs = 64; const double kPi = 3.141592653589793238462643383279502884; diff --git a/test/sad_test.cc b/test/sad_test.cc index 6c28edb51..001d21dad 100644 --- a/test/sad_test.cc +++ b/test/sad_test.cc @@ -16,22 +16,7 @@ #include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" #include "vpx_mem/vpx_mem.h" - -/* Needed for ROUND_POWER_OF_TWO and CONVERT_TO* macros, both of which should be - * moved to a more generic location. Alternatively the *avg functions could be - * restricted to VP9 builds, but it would be better to avoid that sort of - * specificity. - * TODO(johannkoenig): move these macros to a common location. - */ -#if CONFIG_VP9_HIGHBITDEPTH -#include "vp9/common/vp9_common.h" -#endif // CONFIG_VP9_HIGHBITDEPTH - -#ifndef ROUND_POWER_OF_TWO -#define ROUND_POWER_OF_TWO(value, n) \ - (((value) + (1 << ((n) - 1))) >> (n)) -#endif // ROUND_POWER_OF_TWO - +#include "vpx_ports/mem.h" #include "test/acm_random.h" #include "test/clear_system_state.h" diff --git a/test/variance_test.cc b/test/variance_test.cc index a8dd7de13..e4e27af7c 100644 --- a/test/variance_test.cc +++ b/test/variance_test.cc @@ -20,6 +20,7 @@ #include "vpx/vpx_codec.h" #include "vpx/vpx_integer.h" #include "vpx_mem/vpx_mem.h" +#include "vpx_ports/mem.h" #if CONFIG_VP8_ENCODER # include "./vp8_rtcd.h" # include "vp8/common/variance.h" |