Commit 002ad408 authored by James Zern's avatar James Zern

test/: remove unnecessary extern "C"s

Change-Id: I826655a708010149de231ca31a2e3ba4f1842c0c
parent 25cfd8e8
...@@ -11,11 +11,9 @@ ...@@ -11,11 +11,9 @@
#define TEST_CLEAR_SYSTEM_STATE_H_ #define TEST_CLEAR_SYSTEM_STATE_H_
#include "./vpx_config.h" #include "./vpx_config.h"
extern "C" {
#if ARCH_X86 || ARCH_X86_64 #if ARCH_X86 || ARCH_X86_64
# include "vpx_ports/x86.h" # include "vpx_ports/x86.h"
#endif #endif
}
namespace libvpx_test { namespace libvpx_test {
......
...@@ -14,13 +14,11 @@ ...@@ -14,13 +14,11 @@
#include "test/util.h" #include "test/util.h"
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
#include "vp9/common/vp9_filter.h" #include "vp9/common/vp9_filter.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
}
namespace { namespace {
typedef void (*convolve_fn_t)(const uint8_t *src, ptrdiff_t src_stride, typedef void (*convolve_fn_t)(const uint8_t *src, ptrdiff_t src_stride,
......
...@@ -18,12 +18,13 @@ ...@@ -18,12 +18,13 @@
#include "test/register_state_check.h" #include "test/register_state_check.h"
#include "test/util.h" #include "test/util.h"
extern "C" {
#include "vp9/common/vp9_entropy.h"
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
#include "vp9/common/vp9_entropy.h"
#include "vpx/vpx_integer.h"
extern "C" {
void vp9_idct16x16_256_add_c(const int16_t *input, uint8_t *output, int pitch); void vp9_idct16x16_256_add_c(const int16_t *input, uint8_t *output, int pitch);
} }
#include "vpx/vpx_integer.h"
using libvpx_test::ACMRandom; using libvpx_test::ACMRandom;
......
...@@ -18,12 +18,9 @@ ...@@ -18,12 +18,9 @@
#include "test/register_state_check.h" #include "test/register_state_check.h"
#include "test/util.h" #include "test/util.h"
extern "C" {
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vp9/common/vp9_entropy.h"
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
} #include "vp9/common/vp9_entropy.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
using libvpx_test::ACMRandom; using libvpx_test::ACMRandom;
......
...@@ -18,12 +18,13 @@ ...@@ -18,12 +18,13 @@
#include "test/register_state_check.h" #include "test/register_state_check.h"
#include "test/util.h" #include "test/util.h"
extern "C" {
#include "vp9/common/vp9_entropy.h"
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
#include "vp9/common/vp9_entropy.h"
#include "vpx/vpx_integer.h"
extern "C" {
void vp9_idct4x4_16_add_c(const int16_t *input, uint8_t *output, int pitch); void vp9_idct4x4_16_add_c(const int16_t *input, uint8_t *output, int pitch);
} }
#include "vpx/vpx_integer.h"
using libvpx_test::ACMRandom; using libvpx_test::ACMRandom;
......
...@@ -18,12 +18,13 @@ ...@@ -18,12 +18,13 @@
#include "test/register_state_check.h" #include "test/register_state_check.h"
#include "test/util.h" #include "test/util.h"
extern "C" {
#include "vp9/common/vp9_entropy.h"
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
#include "vp9/common/vp9_entropy.h"
#include "vpx/vpx_integer.h"
extern "C" {
void vp9_idct8x8_64_add_c(const int16_t *input, uint8_t *output, int pitch); void vp9_idct8x8_64_add_c(const int16_t *input, uint8_t *output, int pitch);
} }
#include "vpx/vpx_integer.h"
using libvpx_test::ACMRandom; using libvpx_test::ACMRandom;
......
...@@ -14,12 +14,11 @@ ...@@ -14,12 +14,11 @@
#include "test/clear_system_state.h" #include "test/clear_system_state.h"
#include "test/register_state_check.h" #include "test/register_state_check.h"
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vp8_rtcd.h" #include "./vp8_rtcd.h"
#include "vp8/common/blockd.h" #include "vp8/common/blockd.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
}
namespace { namespace {
......
...@@ -11,10 +11,8 @@ ...@@ -11,10 +11,8 @@
#ifndef TEST_MD5_HELPER_H_ #ifndef TEST_MD5_HELPER_H_
#define TEST_MD5_HELPER_H_ #define TEST_MD5_HELPER_H_
extern "C" {
#include "./md5_utils.h" #include "./md5_utils.h"
#include "vpx/vpx_decoder.h" #include "vpx/vpx_decoder.h"
}
namespace libvpx_test { namespace libvpx_test {
class MD5 { class MD5 {
......
...@@ -18,12 +18,9 @@ ...@@ -18,12 +18,9 @@
#include "test/register_state_check.h" #include "test/register_state_check.h"
#include "test/util.h" #include "test/util.h"
extern "C" {
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
#include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_scan.h" #include "vp9/common/vp9_scan.h"
}
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
using libvpx_test::ACMRandom; using libvpx_test::ACMRandom;
......
...@@ -18,11 +18,9 @@ ...@@ -18,11 +18,9 @@
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
#include "test/acm_random.h" #include "test/acm_random.h"
#include "vp8/encoder/onyx_int.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
extern "C" {
#include "vp8/encoder/onyx_int.h"
}
using libvpx_test::ACMRandom; using libvpx_test::ACMRandom;
......
...@@ -12,13 +12,11 @@ ...@@ -12,13 +12,11 @@
#include "test/acm_random.h" #include "test/acm_random.h"
#include "test/clear_system_state.h" #include "test/clear_system_state.h"
#include "test/register_state_check.h" #include "test/register_state_check.h"
extern "C" {
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vp8_rtcd.h" #include "./vp8_rtcd.h"
#include "vp8/common/blockd.h" #include "vp8/common/blockd.h"
#include "vp8/encoder/block.h" #include "vp8/encoder/block.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
}
typedef void (*subtract_b_fn_t)(BLOCK *be, BLOCKD *bd, int pitch); typedef void (*subtract_b_fn_t)(BLOCK *be, BLOCKD *bd, int pitch);
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
*/ */
#include <string> #include <string>
#include "./vpx_config.h" #include "./vpx_config.h"
extern "C" {
#if ARCH_X86 || ARCH_X86_64 #if ARCH_X86 || ARCH_X86_64
#include "vpx_ports/x86.h" #include "vpx_ports/x86.h"
#endif #endif
extern "C" {
#if CONFIG_VP8 #if CONFIG_VP8
extern void vp8_rtcd(); extern void vp8_rtcd();
#endif #endif
......
...@@ -17,17 +17,15 @@ ...@@ -17,17 +17,15 @@
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "./vpx_config.h" #include "./vpx_config.h"
extern "C" {
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
# include "vp8/common/variance.h"
# include "./vp8_rtcd.h" # include "./vp8_rtcd.h"
# include "vp8/common/variance.h"
#endif #endif
#if CONFIG_VP9_ENCODER #if CONFIG_VP9_ENCODER
# include "vp9/encoder/vp9_variance.h"
# include "./vp9_rtcd.h" # include "./vp9_rtcd.h"
# include "vp9/encoder/vp9_variance.h"
#endif #endif
}
#include "test/acm_random.h" #include "test/acm_random.h"
namespace { namespace {
......
...@@ -20,10 +20,8 @@ ...@@ -20,10 +20,8 @@
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
extern "C" {
#include "vp8/encoder/boolhuff.h" #include "vp8/encoder/boolhuff.h"
#include "vp8/decoder/dboolhuff.h" #include "vp8/decoder/dboolhuff.h"
}
namespace { namespace {
const int num_tests = 10; const int num_tests = 10;
......
...@@ -14,10 +14,8 @@ ...@@ -14,10 +14,8 @@
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
#include "vp9/decoder/vp9_reader.h" #include "vp9/decoder/vp9_reader.h"
#include "vp9/encoder/vp9_writer.h" #include "vp9/encoder/vp9_writer.h"
}
#include "test/acm_random.h" #include "test/acm_random.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
......
...@@ -12,12 +12,10 @@ ...@@ -12,12 +12,10 @@
#include "test/acm_random.h" #include "test/acm_random.h"
#include "test/clear_system_state.h" #include "test/clear_system_state.h"
#include "test/register_state_check.h" #include "test/register_state_check.h"
extern "C" {
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
#include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
}
typedef void (*subtract_fn_t)(int rows, int cols, typedef void (*subtract_fn_t)(int rows, int cols,
int16_t *diff_ptr, ptrdiff_t diff_stride, int16_t *diff_ptr, ptrdiff_t diff_stride,
......
...@@ -12,9 +12,7 @@ ...@@ -12,9 +12,7 @@
#include <string> #include <string>
#include "test/video_source.h" #include "test/video_source.h"
extern "C" {
#include "./y4minput.h" #include "./y4minput.h"
}
namespace libvpx_test { namespace libvpx_test {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment