diff options
33 files changed, 106 insertions, 90 deletions
diff --git a/test/blockiness_test.cc b/test/blockiness_test.cc index 92cce6a85..0c60baaa3 100644 --- a/test/blockiness_test.cc +++ b/test/blockiness_test.cc @@ -8,10 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ - -#include <string.h> #include <limits.h> #include <stdio.h> +#include <string.h> + +#include "third_party/googletest/src/include/gtest/gtest.h" #include "./vpx_config.h" #if CONFIG_VP9_ENCODER @@ -22,7 +23,6 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "third_party/googletest/src/include/gtest/gtest.h" #include "vpx_mem/vpx_mem.h" diff --git a/test/consistency_test.cc b/test/consistency_test.cc index 66f694c68..db247a3f0 100644 --- a/test/consistency_test.cc +++ b/test/consistency_test.cc @@ -8,10 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ - -#include <string.h> #include <limits.h> #include <stdio.h> +#include <string.h> + +#include "third_party/googletest/src/include/gtest/gtest.h" #include "./vpx_config.h" #if CONFIG_VP9_ENCODER @@ -22,7 +23,6 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "third_party/googletest/src/include/gtest/gtest.h" #include "vp9/encoder/vp9_ssim.h" #include "vpx_mem/vpx_mem.h" diff --git a/test/convolve_test.cc b/test/convolve_test.cc index c1c5d77b2..b66da683c 100644 --- a/test/convolve_test.cc +++ b/test/convolve_test.cc @@ -9,14 +9,15 @@ */ #include <string.h> -#include "test/acm_random.h" -#include "test/clear_system_state.h" -#include "test/register_state_check.h" -#include "test/util.h" + #include "third_party/googletest/src/include/gtest/gtest.h" #include "./vpx_config.h" #include "./vp9_rtcd.h" +#include "test/acm_random.h" +#include "test/clear_system_state.h" +#include "test/register_state_check.h" +#include "test/util.h" #include "vp9/common/vp9_common.h" #include "vp9/common/vp9_filter.h" #include "vpx_mem/vpx_mem.h" diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc index b1f7e7e0c..173e5bb80 100644 --- a/test/dct16x16_test.cc +++ b/test/dct16x16_test.cc @@ -13,13 +13,13 @@ #include <string.h> #include "third_party/googletest/src/include/gtest/gtest.h" + +#include "./vp9_rtcd.h" +#include "./vpx_dsp_rtcd.h" #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" - -#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" #include "vp9/common/vp9_entropy.h" #include "vp9/common/vp9_scan.h" #include "vpx/vpx_codec.h" diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index f406fa2b2..70a2b2394 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc @@ -12,15 +12,15 @@ #include <stdlib.h> #include <string.h> -#include "test/acm_random.h" -#include "test/clear_system_state.h" -#include "test/register_state_check.h" -#include "test/util.h" #include "third_party/googletest/src/include/gtest/gtest.h" #include "./vp9_rtcd.h" #include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" +#include "test/acm_random.h" +#include "test/clear_system_state.h" +#include "test/register_state_check.h" +#include "test/util.h" #include "vp9/common/vp9_entropy.h" #include "vpx/vpx_codec.h" #include "vpx/vpx_integer.h" diff --git a/test/decode_api_test.cc b/test/decode_api_test.cc index 32be1f411..c10a44a33 100644 --- a/test/decode_api_test.cc +++ b/test/decode_api_test.cc @@ -7,10 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ + #include "third_party/googletest/src/include/gtest/gtest.h" -#include "test/ivf_video_source.h" #include "./vpx_config.h" +#include "test/ivf_video_source.h" #include "vpx/vp8dx.h" #include "vpx/vpx_decoder.h" diff --git a/test/decode_test_driver.cc b/test/decode_test_driver.cc index 7ce190c30..ad861c315 100644 --- a/test/decode_test_driver.cc +++ b/test/decode_test_driver.cc @@ -7,9 +7,11 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ + +#include "third_party/googletest/src/include/gtest/gtest.h" + #include "test/codec_factory.h" #include "test/decode_test_driver.h" -#include "third_party/googletest/src/include/gtest/gtest.h" #include "test/register_state_check.h" #include "test/video_source.h" diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc index ff39f1afa..e734bc98a 100644 --- a/test/encode_test_driver.cc +++ b/test/encode_test_driver.cc @@ -10,13 +10,14 @@ #include <string> +#include "third_party/googletest/src/include/gtest/gtest.h" + #include "./vpx_config.h" #include "test/codec_factory.h" -#include "test/encode_test_driver.h" #include "test/decode_test_driver.h" +#include "test/encode_test_driver.h" #include "test/register_state_check.h" #include "test/video_source.h" -#include "third_party/googletest/src/include/gtest/gtest.h" namespace libvpx_test { void Encoder::InitEncoder(VideoSource *video) { diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h index 7a068bf0b..f7c962186 100644 --- a/test/encode_test_driver.h +++ b/test/encode_test_driver.h @@ -13,12 +13,13 @@ #include <string> #include <vector> -#include "./vpx_config.h" #include "third_party/googletest/src/include/gtest/gtest.h" -#include "vpx/vpx_encoder.h" + +#include "./vpx_config.h" #if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER #include "vpx/vp8cx.h" #endif +#include "vpx/vpx_encoder.h" namespace libvpx_test { diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc index 757380158..9dcf636d9 100644 --- a/test/fdct4x4_test.cc +++ b/test/fdct4x4_test.cc @@ -13,13 +13,13 @@ #include <string.h> #include "third_party/googletest/src/include/gtest/gtest.h" + +#include "./vp9_rtcd.h" +#include "./vpx_dsp_rtcd.h" #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" - -#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" #include "vp9/common/vp9_entropy.h" #include "vpx/vpx_codec.h" #include "vpx/vpx_integer.h" diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc index fb7fbb529..eeafde1af 100644 --- a/test/fdct8x8_test.cc +++ b/test/fdct8x8_test.cc @@ -13,13 +13,13 @@ #include <string.h> #include "third_party/googletest/src/include/gtest/gtest.h" + +#include "./vp9_rtcd.h" +#include "./vpx_dsp_rtcd.h" #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" - -#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" #include "vp9/common/vp9_entropy.h" #include "vp9/common/vp9_scan.h" #include "vpx/vpx_codec.h" diff --git a/test/idct_test.cc b/test/idct_test.cc index 34b721f79..39db3e4c6 100644 --- a/test/idct_test.cc +++ b/test/idct_test.cc @@ -10,10 +10,11 @@ #include "./vpx_config.h" #include "./vp8_rtcd.h" -#include "test/clear_system_state.h" -#include "test/register_state_check.h" + #include "third_party/googletest/src/include/gtest/gtest.h" +#include "test/clear_system_state.h" +#include "test/register_state_check.h" #include "vpx/vpx_integer.h" typedef void (*IdctFunc)(int16_t *input, unsigned char *pred_ptr, diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc index 6a6a5ed9f..65a069748 100644 --- a/test/intrapred_test.cc +++ b/test/intrapred_test.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ - #include <string.h> -#include "test/acm_random.h" -#include "test/clear_system_state.h" -#include "test/register_state_check.h" + #include "third_party/googletest/src/include/gtest/gtest.h" #include "./vpx_config.h" #include "./vp8_rtcd.h" +#include "test/acm_random.h" +#include "test/clear_system_state.h" +#include "test/register_state_check.h" #include "vp8/common/blockd.h" #include "vpx_mem/vpx_mem.h" diff --git a/test/lpf_8_test.cc b/test/lpf_8_test.cc index 96aaa23df..966e1095a 100644 --- a/test/lpf_8_test.cc +++ b/test/lpf_8_test.cc @@ -13,13 +13,13 @@ #include <string> #include "third_party/googletest/src/include/gtest/gtest.h" + +#include "./vpx_config.h" +#include "./vpx_dsp_rtcd.h" #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" - -#include "./vpx_config.h" -#include "./vpx_dsp_rtcd.h" #include "vp9/common/vp9_entropy.h" #include "vp9/common/vp9_loopfilter.h" #include "vpx/vpx_integer.h" diff --git a/test/partial_idct_test.cc b/test/partial_idct_test.cc index 6d77b7c44..09cd09b7a 100644 --- a/test/partial_idct_test.cc +++ b/test/partial_idct_test.cc @@ -13,13 +13,13 @@ #include <string.h> #include "third_party/googletest/src/include/gtest/gtest.h" + +#include "./vp9_rtcd.h" +#include "./vpx_dsp_rtcd.h" #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" - -#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" #include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_scan.h" #include "vpx/vpx_integer.h" diff --git a/test/quantize_test.cc b/test/quantize_test.cc index 46e463dfc..a62eabcbe 100644 --- a/test/quantize_test.cc +++ b/test/quantize_test.cc @@ -11,13 +11,13 @@ #include <string.h> #include "third_party/googletest/src/include/gtest/gtest.h" + +#include "./vpx_config.h" +#include "./vp8_rtcd.h" #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" - -#include "./vpx_config.h" -#include "./vp8_rtcd.h" #include "vp8/common/blockd.h" #include "vp8/common/onyx.h" #include "vp8/encoder/block.h" diff --git a/test/sad_test.cc b/test/sad_test.cc index 1c17bfec7..e6a5e0ba6 100644 --- a/test/sad_test.cc +++ b/test/sad_test.cc @@ -13,18 +13,17 @@ #include <limits.h> #include <stdio.h> +#include "third_party/googletest/src/include/gtest/gtest.h" + #include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" -#include "vpx_mem/vpx_mem.h" -#include "vpx_ports/mem.h" - #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "third_party/googletest/src/include/gtest/gtest.h" #include "vpx/vpx_codec.h" - +#include "vpx_mem/vpx_mem.h" +#include "vpx_ports/mem.h" typedef unsigned int (*SadMxNFunc)(const uint8_t *src_ptr, int src_stride, diff --git a/test/sixtap_predict_test.cc b/test/sixtap_predict_test.cc index 07383aea1..8c7c98d8b 100644 --- a/test/sixtap_predict_test.cc +++ b/test/sixtap_predict_test.cc @@ -11,13 +11,15 @@ #include <math.h> #include <stdlib.h> #include <string.h> + +#include "third_party/googletest/src/include/gtest/gtest.h" + +#include "./vpx_config.h" +#include "./vp8_rtcd.h" #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "third_party/googletest/src/include/gtest/gtest.h" -#include "./vpx_config.h" -#include "./vp8_rtcd.h" #include "vpx/vpx_integer.h" #include "vpx_mem/vpx_mem.h" diff --git a/test/test_libvpx.cc b/test/test_libvpx.cc index 9b29fed2f..264991740 100644 --- a/test/test_libvpx.cc +++ b/test/test_libvpx.cc @@ -8,6 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ #include <string> + +#include "third_party/googletest/src/include/gtest/gtest.h" + #include "./vpx_config.h" #if ARCH_X86 || ARCH_X86_64 #include "vpx_ports/x86.h" @@ -22,7 +25,6 @@ extern void vp9_rtcd(); extern void vpx_dsp_rtcd(); extern void vpx_scale_rtcd(); } -#include "third_party/googletest/src/include/gtest/gtest.h" static void append_negative_gtest_filter(const char *str) { std::string filter = ::testing::FLAGS_gtest_filter; diff --git a/test/variance_test.cc b/test/variance_test.cc index 74775bb74..7a34db6b3 100644 --- a/test/variance_test.cc +++ b/test/variance_test.cc @@ -11,17 +11,17 @@ #include <cstdlib> #include <new> -#include "test/acm_random.h" -#include "test/clear_system_state.h" -#include "test/register_state_check.h" #include "third_party/googletest/src/include/gtest/gtest.h" #include "./vpx_config.h" +#include "./vpx_dsp_rtcd.h" +#include "test/acm_random.h" +#include "test/clear_system_state.h" +#include "test/register_state_check.h" #include "vpx/vpx_codec.h" #include "vpx/vpx_integer.h" #include "vpx_mem/vpx_mem.h" #include "vpx_ports/mem.h" -#include "./vpx_dsp_rtcd.h" namespace { diff --git a/test/vp8_boolcoder_test.cc b/test/vp8_boolcoder_test.cc index 99b5f0c86..02d7162ac 100644 --- a/test/vp8_boolcoder_test.cc +++ b/test/vp8_boolcoder_test.cc @@ -16,12 +16,12 @@ #include <string.h> #include <sys/types.h> -#include "test/acm_random.h" #include "third_party/googletest/src/include/gtest/gtest.h" -#include "vpx/vpx_integer.h" -#include "vp8/encoder/boolhuff.h" +#include "test/acm_random.h" #include "vp8/decoder/dboolhuff.h" +#include "vp8/encoder/boolhuff.h" +#include "vpx/vpx_integer.h" namespace { const int num_tests = 10; diff --git a/test/vp8_fdct4x4_test.cc b/test/vp8_fdct4x4_test.cc index bdbf74e77..11a653dec 100644 --- a/test/vp8_fdct4x4_test.cc +++ b/test/vp8_fdct4x4_test.cc @@ -15,10 +15,10 @@ #include <string.h> #include <sys/types.h> -#include "./vp8_rtcd.h" +#include "third_party/googletest/src/include/gtest/gtest.h" +#include "./vp8_rtcd.h" #include "test/acm_random.h" -#include "third_party/googletest/src/include/gtest/gtest.h" #include "vpx/vpx_integer.h" namespace { diff --git a/test/vp9_arf_freq_test.cc b/test/vp9_arf_freq_test.cc index 07968bcd6..aa3e34d62 100644 --- a/test/vp9_arf_freq_test.cc +++ b/test/vp9_arf_freq_test.cc @@ -8,12 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "third_party/googletest/src/include/gtest/gtest.h" + #include "test/codec_factory.h" #include "test/encode_test_driver.h" +#include "test/util.h" #include "test/y4m_video_source.h" #include "test/yuv_video_source.h" -#include "test/util.h" -#include "third_party/googletest/src/include/gtest/gtest.h" #include "vp9/encoder/vp9_ratectrl.h" namespace { diff --git a/test/vp9_avg_test.cc b/test/vp9_avg_test.cc index 09c2069c4..d38313116 100644 --- a/test/vp9_avg_test.cc +++ b/test/vp9_avg_test.cc @@ -8,22 +8,22 @@ * be found in the AUTHORS file in the root of the source tree. */ - -#include <string.h> #include <limits.h> #include <stdio.h> +#include <string.h> + +#include "third_party/googletest/src/include/gtest/gtest.h" #include "./vpx_config.h" #if CONFIG_VP9_ENCODER #include "./vp9_rtcd.h" #endif -#include "vpx_mem/vpx_mem.h" #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "third_party/googletest/src/include/gtest/gtest.h" +#include "vpx_mem/vpx_mem.h" using libvpx_test::ACMRandom; diff --git a/test/vp9_boolcoder_test.cc b/test/vp9_boolcoder_test.cc index b91742975..c61bb4ab9 100644 --- a/test/vp9_boolcoder_test.cc +++ b/test/vp9_boolcoder_test.cc @@ -14,12 +14,11 @@ #include "third_party/googletest/src/include/gtest/gtest.h" +#include "test/acm_random.h" #include "vpx/vpx_integer.h" #include "vpx_dsp/bitreader.h" #include "vpx_dsp/bitwriter.h" -#include "test/acm_random.h" - using libvpx_test::ACMRandom; namespace { diff --git a/test/vp9_encoder_parms_get_to_decoder.cc b/test/vp9_encoder_parms_get_to_decoder.cc index c477af9e5..2049466a0 100644 --- a/test/vp9_encoder_parms_get_to_decoder.cc +++ b/test/vp9_encoder_parms_get_to_decoder.cc @@ -8,12 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "third_party/googletest/src/include/gtest/gtest.h" + #include "test/codec_factory.h" #include "test/encode_test_driver.h" +#include "test/util.h" #include "test/y4m_video_source.h" #include "test/yuv_video_source.h" -#include "test/util.h" -#include "third_party/googletest/src/include/gtest/gtest.h" #include "vp9/decoder/vp9_decoder.h" typedef vpx_codec_stream_info_t vp9_stream_info_t; diff --git a/test/vp9_end_to_end_test.cc b/test/vp9_end_to_end_test.cc index b7dd932e0..0fea6039d 100644 --- a/test/vp9_end_to_end_test.cc +++ b/test/vp9_end_to_end_test.cc @@ -8,12 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "third_party/googletest/src/include/gtest/gtest.h" + #include "test/codec_factory.h" #include "test/encode_test_driver.h" +#include "test/util.h" #include "test/y4m_video_source.h" #include "test/yuv_video_source.h" -#include "test/util.h" -#include "third_party/googletest/src/include/gtest/gtest.h" namespace { diff --git a/test/vp9_error_block_test.cc b/test/vp9_error_block_test.cc index ac19c2e3d..8c5d5a2e2 100644 --- a/test/vp9_error_block_test.cc +++ b/test/vp9_error_block_test.cc @@ -14,12 +14,12 @@ #include "third_party/googletest/src/include/gtest/gtest.h" +#include "./vpx_config.h" +#include "./vp9_rtcd.h" #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "./vpx_config.h" -#include "./vp9_rtcd.h" #include "vp9/common/vp9_entropy.h" #include "vpx/vpx_codec.h" #include "vpx/vpx_integer.h" diff --git a/test/vp9_intrapred_test.cc b/test/vp9_intrapred_test.cc index c17259ae9..ad3327e2d 100644 --- a/test/vp9_intrapred_test.cc +++ b/test/vp9_intrapred_test.cc @@ -10,17 +10,17 @@ #include <string> -#include "test/acm_random.h" -#include "test/clear_system_state.h" -#include "test/register_state_check.h" #include "third_party/googletest/src/include/gtest/gtest.h" #include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" +#include "test/acm_random.h" +#include "test/clear_system_state.h" +#include "test/register_state_check.h" +#include "test/util.h" #include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_pred_common.h" #include "vpx_mem/vpx_mem.h" -#include "test/util.h" namespace { diff --git a/test/vp9_lossless_test.cc b/test/vp9_lossless_test.cc index 67215d315..417739315 100644 --- a/test/vp9_lossless_test.cc +++ b/test/vp9_lossless_test.cc @@ -7,8 +7,10 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "./vpx_config.h" + #include "third_party/googletest/src/include/gtest/gtest.h" + +#include "./vpx_config.h" #include "test/codec_factory.h" #include "test/encode_test_driver.h" #include "test/i420_video_source.h" diff --git a/test/vp9_subtract_test.cc b/test/vp9_subtract_test.cc index a1798d706..d78b27772 100644 --- a/test/vp9_subtract_test.cc +++ b/test/vp9_subtract_test.cc @@ -9,12 +9,13 @@ */ #include "third_party/googletest/src/include/gtest/gtest.h" + +#include "./vp9_rtcd.h" +#include "./vpx_config.h" +#include "./vpx_dsp_rtcd.h" #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" -#include "./vpx_config.h" -#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" #include "vp9/common/vp9_blockd.h" #include "vpx_mem/vpx_mem.h" diff --git a/test/vpx_scale_test.cc b/test/vpx_scale_test.cc index b30a06be0..ef716fc80 100644 --- a/test/vpx_scale_test.cc +++ b/test/vpx_scale_test.cc @@ -10,11 +10,10 @@ #include "third_party/googletest/src/include/gtest/gtest.h" -#include "test/clear_system_state.h" -#include "test/register_state_check.h" - #include "./vpx_config.h" #include "./vpx_scale_rtcd.h" +#include "test/clear_system_state.h" +#include "test/register_state_check.h" #include "vpx_mem/vpx_mem.h" #include "vpx_scale/yv12config.h" diff --git a/test/y4m_test.cc b/test/y4m_test.cc index 58a6fe3fa..a5553292c 100644 --- a/test/y4m_test.cc +++ b/test/y4m_test.cc @@ -9,12 +9,14 @@ */ #include <string> -#include "test/md5_helper.h" -#include "test/util.h" -#include "test/y4m_video_source.h" + #include "third_party/googletest/src/include/gtest/gtest.h" + #include "./vpx_config.h" #include "./y4menc.h" +#include "test/md5_helper.h" +#include "test/util.h" +#include "test/y4m_video_source.h" namespace { |