shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Cosmetics - Fix header file order in unit tests"

--- a/test/blockiness_test.cc

+++ b/test/blockiness_test.cc

@@ -8,11 +8,12 @@

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

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

--- a/test/consistency_test.cc

+++ b/test/consistency_test.cc

@@ -8,11 +8,12 @@

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

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

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

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

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

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

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

--- 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) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

--- a/test/vp9_boolcoder_test.cc

+++ b/test/vp9_boolcoder_test.cc

@@ -14,11 +14,10 @@

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

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

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

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

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

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

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

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

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

-- 

⑨