shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes I57a94d2f,Ifb305185

* changes:
  test/: remove some unnecessary extern "C"s
  rtcd.sh: add extern "C" to generated headers

--- a/build/make/rtcd.sh

+++ b/build/make/rtcd.sh

@@ -209,6 +209,10 @@

 #define RTCD_EXTERN extern

 #endif

+#ifdef __cplusplus

+extern "C" {

+#endif

+

 $(process_forward_decls)

 $(declare_function_pointers c $ALL_ARCHS)

@@ -219,6 +223,11 @@

 common_bottom() {

   cat <<EOF

+

+#ifdef __cplusplus

+}  // extern "C"

+#endif

+

 #endif

 EOF

 }

--- a/test/codec_factory.h

+++ b/test/codec_factory.h

@@ -10,7 +10,6 @@

 #ifndef TEST_CODEC_FACTORY_H_

 #define TEST_CODEC_FACTORY_H_

-extern "C" {

 #include "./vpx_config.h"

 #include "vpx/vpx_decoder.h"

 #include "vpx/vpx_encoder.h"

@@ -20,7 +19,6 @@

 #if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER

 #include "vpx/vp8dx.h"

 #endif

-}

 #include "test/decode_test_driver.h"

 #include "test/encode_test_driver.h"

--- a/test/idct8x8_test.cc

+++ b/test/idct8x8_test.cc

@@ -14,9 +14,7 @@

 #include "third_party/googletest/src/include/gtest/gtest.h"

-extern "C" {

 #include "./vp9_rtcd.h"

-}

 #include "test/acm_random.h"

 #include "vpx/vpx_integer.h"

--- a/test/idct_test.cc

+++ b/test/idct_test.cc

@@ -8,10 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-extern "C" {

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

--- a/test/pp_filter_test.cc

+++ b/test/pp_filter_test.cc

@@ -10,12 +10,10 @@

 #include "test/clear_system_state.h"

 #include "test/register_state_check.h"

 #include "third_party/googletest/src/include/gtest/gtest.h"

-extern "C" {

 #include "./vpx_config.h"

 #include "./vp8_rtcd.h"

 #include "vpx/vpx_integer.h"

 #include "vpx_mem/vpx_mem.h"

-}

 typedef void (*post_proc_func_t)(unsigned char *src_ptr,

                                  unsigned char *dst_ptr,

--- a/test/sad_test.cc

+++ b/test/sad_test.cc

@@ -13,7 +13,6 @@

 #include <limits.h>

 #include <stdio.h>

-extern "C" {

 #include "./vpx_config.h"

 #if CONFIG_VP8_ENCODER

 #include "./vp8_rtcd.h"

@@ -22,7 +21,6 @@

 #include "./vp9_rtcd.h"

 #endif

 #include "vpx_mem/vpx_mem.h"

-}

 #include "test/acm_random.h"

 #include "test/clear_system_state.h"

--- a/test/sixtap_predict_test.cc

+++ b/test/sixtap_predict_test.cc

@@ -16,12 +16,10 @@

 #include "test/register_state_check.h"

 #include "test/util.h"

 #include "third_party/googletest/src/include/gtest/gtest.h"

-extern "C" {

 #include "./vpx_config.h"

 #include "./vp8_rtcd.h"

 #include "vpx/vpx_integer.h"

 #include "vpx_mem/vpx_mem.h"

-}

 namespace {

--- a/test/test_vector_test.cc

+++ b/test/test_vector_test.cc

@@ -19,9 +19,7 @@

 #include "test/test_vectors.h"

 #include "test/util.h"

 #include "test/webm_video_source.h"

-extern "C" {

 #include "vpx_mem/vpx_mem.h"

-}

 namespace {

--- a/test/tile_independence_test.cc

+++ b/test/tile_independence_test.cc

@@ -17,9 +17,7 @@

 #include "test/i420_video_source.h"

 #include "test/util.h"

 #include "test/md5_helper.h"

-extern "C" {

 #include "vpx_mem/vpx_mem.h"

-}

 namespace {

 class TileIndependenceTest : public ::libvpx_test::EncoderTest,

--- a/test/vp8_fdct4x4_test.cc

+++ b/test/vp8_fdct4x4_test.cc

@@ -15,9 +15,7 @@

 #include <string.h>

 #include <sys/types.h>

-extern "C" {

 #include "./vp8_rtcd.h"

-}

 #include "test/acm_random.h"

 #include "third_party/googletest/src/include/gtest/gtest.h"

-- 

⑨