shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes from topic 'missing-proto'

* changes:
  fdct8x8_test: move functions to an anonymous namespace
  md5_utils.c: make a function static
  vpx_config.c: add vpx_codec include

--- a/configure

+++ b/configure

@@ -726,6 +726,7 @@

 process "$@"

 print_webm_license ${BUILD_PFX}vpx_config.c "/*" " */"

 cat <<EOF >> ${BUILD_PFX}vpx_config.c

+#include "vpx/vpx_codec.h"

 static const char* const cfg = "$CONFIGURE_ARGS";

 const char *vpx_codec_build_config(void) {return cfg;}

 EOF

--- a/md5_utils.c

+++ b/md5_utils.c

@@ -24,7 +24,7 @@

 #include "md5_utils.h"

-void

+static void

 byteSwap(UWORD32 *buf, unsigned words) {

   md5byte *p;

--- a/test/fdct8x8_test.cc

+++ b/test/fdct8x8_test.cc

@@ -24,8 +24,27 @@

 #include "vpx/vpx_integer.h"

 #include "vpx_ports/mem.h"

+using libvpx_test::ACMRandom;

+

+namespace {

+

 const int kNumCoeffs = 64;

 const double kPi = 3.141592653589793238462643383279502884;

+

+const int kSignBiasMaxDiff255 = 1500;

+const int kSignBiasMaxDiff15 = 10000;

+

+typedef void (*FdctFunc)(const int16_t *in, tran_low_t *out, int stride);

+typedef void (*IdctFunc)(const tran_low_t *in, uint8_t *out, int stride);

+typedef void (*FhtFunc)(const int16_t *in, tran_low_t *out, int stride,

+                        int tx_type);

+typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,

+                        int tx_type);

+

+typedef std::tr1::tuple<FdctFunc, IdctFunc, int, vpx_bit_depth_t> Dct8x8Param;

+typedef std::tr1::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht8x8Param;

+typedef std::tr1::tuple<IdctFunc, IdctFunc, int, vpx_bit_depth_t> Idct8x8Param;

+

 void reference_8x8_dct_1d(const double in[8], double out[8], int stride) {

   const double kInvSqrt2 = 0.707106781186547524400844362104;

   for (int k = 0; k < 8; k++) {

@@ -60,23 +79,6 @@

   }

 }

-using libvpx_test::ACMRandom;

-

-namespace {

-

-const int kSignBiasMaxDiff255 = 1500;

-const int kSignBiasMaxDiff15 = 10000;

-

-typedef void (*FdctFunc)(const int16_t *in, tran_low_t *out, int stride);

-typedef void (*IdctFunc)(const tran_low_t *in, uint8_t *out, int stride);

-typedef void (*FhtFunc)(const int16_t *in, tran_low_t *out, int stride,

-                        int tx_type);

-typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,

-                        int tx_type);

-

-typedef std::tr1::tuple<FdctFunc, IdctFunc, int, vpx_bit_depth_t> Dct8x8Param;

-typedef std::tr1::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht8x8Param;

-typedef std::tr1::tuple<IdctFunc, IdctFunc, int, vpx_bit_depth_t> Idct8x8Param;

 void fdct8x8_ref(const int16_t *in, tran_low_t *out, int stride, int tx_type) {

   vp9_fdct8x8_c(in, out, stride);