shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "clang-format v6.0.1"

--- a/test/dct_partial_test.cc

+++ b/test/dct_partial_test.cc

@@ -26,10 +26,10 @@

 #include "vpx/vpx_integer.h"

 #include "vpx_dsp/vpx_dsp_common.h"

-using ::testing::make_tuple;

-using ::testing::tuple;

 using libvpx_test::ACMRandom;

 using libvpx_test::Buffer;

+using ::testing::make_tuple;

+using ::testing::tuple;

 namespace {

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

--- a/test/dct_test.cc

+++ b/test/dct_test.cc

@@ -26,10 +26,10 @@

 #include "vpx/vpx_integer.h"

 #include "vpx_ports/mem.h"

-using ::testing::make_tuple;

-using ::testing::tuple;

 using libvpx_test::ACMRandom;

 using libvpx_test::Buffer;

+using ::testing::make_tuple;

+using ::testing::tuple;

 namespace {

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

--- a/test/predict_test.cc

+++ b/test/predict_test.cc

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

 namespace {

-using ::testing::make_tuple;

 using libvpx_test::ACMRandom;

+using ::testing::make_tuple;

 typedef void (*PredictFunc)(uint8_t *src_ptr, int src_pixels_per_line,

                             int xoffset, int yoffset, uint8_t *dst_ptr,

--- a/test/quantize_test.cc

+++ b/test/quantize_test.cc

@@ -35,8 +35,8 @@

 typedef ::testing::tuple<VP8Quantize, VP8Quantize> VP8QuantizeParam;

-using ::testing::make_tuple;

 using libvpx_test::ACMRandom;

+using ::testing::make_tuple;

 // Create and populate a VP8_COMP instance which has a complete set of

 // quantization inputs as well as a second MACROBLOCKD for output.

--- a/vp8/vp8_cx_iface.c

+++ b/vp8/vp8_cx_iface.c

@@ -49,7 +49,7 @@

 #if !(CONFIG_REALTIME_ONLY)

   0, /* cpu_used      */

 #else

-  4, /* cpu_used      */

+  4,                      /* cpu_used      */

 #endif

   0, /* enable_auto_alt_ref */

   0, /* noise_sensitivity */

--- a/vpx_dsp/mips/inv_txfm_dspr2.h

+++ b/vpx_dsp/mips/inv_txfm_dspr2.h

@@ -25,7 +25,6 @@

 #if HAVE_DSPR2

 #define DCT_CONST_ROUND_SHIFT_TWICE_COSPI_16_64(input)                         \

   ({                                                                           \

-                                                                               \

     int32_t tmp, out;                                                          \

     int dct_cost_rounding = DCT_CONST_ROUNDING;                                \

     int in = input;                                                            \

--- a/vpx_dsp/ppc/subtract_vsx.c

+++ b/vpx_dsp/ppc/subtract_vsx.c

@@ -111,7 +111,6 @@

                           pred, pred_stride);

       }

       break;

-    default:

-      assert(0);  // unreachable

+    default: assert(0);  // unreachable

   }

 }