diff options
Diffstat (limited to 'third_party/aom/test/masked_variance_test.cc')
| -rw-r--r-- | third_party/aom/test/masked_variance_test.cc | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/third_party/aom/test/masked_variance_test.cc b/third_party/aom/test/masked_variance_test.cc index a9cbdc80d..275b9feb6 100644 --- a/third_party/aom/test/masked_variance_test.cc +++ b/third_party/aom/test/masked_variance_test.cc @@ -19,8 +19,9 @@ #include "test/register_state_check.h" #include "test/util.h" -#include "./aom_config.h" -#include "./aom_dsp_rtcd.h" +#include "config/aom_config.h" +#include "config/aom_dsp_rtcd.h" + #include "aom/aom_codec.h" #include "aom/aom_integer.h" #include "aom_dsp/aom_filter.h" @@ -36,7 +37,7 @@ typedef unsigned int (*MaskedSubPixelVarianceFunc)( const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse); -typedef std::tr1::tuple<MaskedSubPixelVarianceFunc, MaskedSubPixelVarianceFunc> +typedef ::testing::tuple<MaskedSubPixelVarianceFunc, MaskedSubPixelVarianceFunc> MaskedSubPixelVarianceParam; class MaskedSubPixelVarianceTest @@ -169,9 +170,8 @@ TEST_P(MaskedSubPixelVarianceTest, ExtremeValues) { << " y_offset = " << first_failure_y; } -#if CONFIG_HIGHBITDEPTH -typedef std::tr1::tuple<MaskedSubPixelVarianceFunc, MaskedSubPixelVarianceFunc, - aom_bit_depth_t> +typedef ::testing::tuple<MaskedSubPixelVarianceFunc, MaskedSubPixelVarianceFunc, + aom_bit_depth_t> HighbdMaskedSubPixelVarianceParam; class HighbdMaskedSubPixelVarianceTest @@ -311,21 +311,18 @@ TEST_P(HighbdMaskedSubPixelVarianceTest, ExtremeValues) { << " x_offset = " << first_failure_x << " y_offset = " << first_failure_y; } -#endif // CONFIG_HIGHBITDEPTH -using std::tr1::make_tuple; +using ::testing::make_tuple; #if HAVE_SSSE3 const MaskedSubPixelVarianceParam sub_pel_var_test[] = { -#if CONFIG_EXT_PARTITION make_tuple(&aom_masked_sub_pixel_variance128x128_ssse3, &aom_masked_sub_pixel_variance128x128_c), make_tuple(&aom_masked_sub_pixel_variance128x64_ssse3, &aom_masked_sub_pixel_variance128x64_c), make_tuple(&aom_masked_sub_pixel_variance64x128_ssse3, &aom_masked_sub_pixel_variance64x128_c), -#endif // CONFIG_EXT_PARTITION make_tuple(&aom_masked_sub_pixel_variance64x64_ssse3, &aom_masked_sub_pixel_variance64x64_c), make_tuple(&aom_masked_sub_pixel_variance64x32_ssse3, @@ -357,16 +354,13 @@ const MaskedSubPixelVarianceParam sub_pel_var_test[] = { INSTANTIATE_TEST_CASE_P(SSSE3_C_COMPARE, MaskedSubPixelVarianceTest, ::testing::ValuesIn(sub_pel_var_test)); -#if CONFIG_HIGHBITDEPTH const HighbdMaskedSubPixelVarianceParam hbd_sub_pel_var_test[] = { -#if CONFIG_EXT_PARTITION make_tuple(&aom_highbd_8_masked_sub_pixel_variance128x128_ssse3, &aom_highbd_8_masked_sub_pixel_variance128x128_c, AOM_BITS_8), make_tuple(&aom_highbd_8_masked_sub_pixel_variance128x64_ssse3, &aom_highbd_8_masked_sub_pixel_variance128x64_c, AOM_BITS_8), make_tuple(&aom_highbd_8_masked_sub_pixel_variance64x128_ssse3, &aom_highbd_8_masked_sub_pixel_variance64x128_c, AOM_BITS_8), -#endif // CONFIG_EXT_PARTITION make_tuple(&aom_highbd_8_masked_sub_pixel_variance64x64_ssse3, &aom_highbd_8_masked_sub_pixel_variance64x64_c, AOM_BITS_8), make_tuple(&aom_highbd_8_masked_sub_pixel_variance64x32_ssse3, @@ -393,14 +387,12 @@ const HighbdMaskedSubPixelVarianceParam hbd_sub_pel_var_test[] = { &aom_highbd_8_masked_sub_pixel_variance4x8_c, AOM_BITS_8), make_tuple(&aom_highbd_8_masked_sub_pixel_variance4x4_ssse3, &aom_highbd_8_masked_sub_pixel_variance4x4_c, AOM_BITS_8), -#if CONFIG_EXT_PARTITION make_tuple(&aom_highbd_10_masked_sub_pixel_variance128x128_ssse3, &aom_highbd_10_masked_sub_pixel_variance128x128_c, AOM_BITS_10), make_tuple(&aom_highbd_10_masked_sub_pixel_variance128x64_ssse3, &aom_highbd_10_masked_sub_pixel_variance128x64_c, AOM_BITS_10), make_tuple(&aom_highbd_10_masked_sub_pixel_variance64x128_ssse3, &aom_highbd_10_masked_sub_pixel_variance64x128_c, AOM_BITS_10), -#endif // CONFIG_EXT_PARTITION make_tuple(&aom_highbd_10_masked_sub_pixel_variance64x64_ssse3, &aom_highbd_10_masked_sub_pixel_variance64x64_c, AOM_BITS_10), make_tuple(&aom_highbd_10_masked_sub_pixel_variance64x32_ssse3, @@ -427,14 +419,12 @@ const HighbdMaskedSubPixelVarianceParam hbd_sub_pel_var_test[] = { &aom_highbd_10_masked_sub_pixel_variance4x8_c, AOM_BITS_10), make_tuple(&aom_highbd_10_masked_sub_pixel_variance4x4_ssse3, &aom_highbd_10_masked_sub_pixel_variance4x4_c, AOM_BITS_10), -#if CONFIG_EXT_PARTITION make_tuple(&aom_highbd_12_masked_sub_pixel_variance128x128_ssse3, &aom_highbd_12_masked_sub_pixel_variance128x128_c, AOM_BITS_12), make_tuple(&aom_highbd_12_masked_sub_pixel_variance128x64_ssse3, &aom_highbd_12_masked_sub_pixel_variance128x64_c, AOM_BITS_12), make_tuple(&aom_highbd_12_masked_sub_pixel_variance64x128_ssse3, &aom_highbd_12_masked_sub_pixel_variance64x128_c, AOM_BITS_12), -#endif // CONFIG_EXT_PARTITION make_tuple(&aom_highbd_12_masked_sub_pixel_variance64x64_ssse3, &aom_highbd_12_masked_sub_pixel_variance64x64_c, AOM_BITS_12), make_tuple(&aom_highbd_12_masked_sub_pixel_variance64x32_ssse3, @@ -465,7 +455,5 @@ const HighbdMaskedSubPixelVarianceParam hbd_sub_pel_var_test[] = { INSTANTIATE_TEST_CASE_P(SSSE3_C_COMPARE, HighbdMaskedSubPixelVarianceTest, ::testing::ValuesIn(hbd_sub_pel_var_test)); -#endif // CONFIG_HIGHBITDEPTH - #endif // HAVE_SSSE3 } // namespace |