clang-format v6.0.1

Change-Id: I83c7e64fe70f7c49aa2492ed2d640c6756b7ebaa

diff --git a/test/dct_partial_test.cc b/test/dct_partial_test.cc
index 6636f566b38edec4880992a77e8ff1810827a197..ee23ebe5c9c9ceb93a043f06b85cf4fca7a255f0 100644 (file)
--- 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);

diff --git a/test/dct_test.cc b/test/dct_test.cc
index d696d82170ff4e2f3cbd04ab11988053215c39c1..e7883c1410987030e1fc6b4e9dcc53fc7f0bade5 100644 (file)
--- 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);

diff --git a/test/predict_test.cc b/test/predict_test.cc
index f6b4df07e461222674a6198d8437c0fc394c724c..a4fcd352f6454f233564c14a1f2da4543782f5a2 100644 (file)
--- 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,

diff --git a/test/quantize_test.cc b/test/quantize_test.cc
index f470cc69956438119e7a0920801445bf376db150..e06241ab85bb4326c0dc82bea6bcd52be5c62f44 100644 (file)
--- a/test/quantize_test.cc
+++ b/test/quantize_test.cc
@@ -35,8 +35,8 @@ typedef void (*VP8Quantize)(BLOCK *b, BLOCKD *d);
 
 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.

diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c
index e1c31341bc149e418c3c58106d2937cb7ee6934c..b5f96a17e417cb1e8b4bffc3bb2ad40e07ed71df 100644 (file)
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -49,7 +49,7 @@ static struct vp8_extracfg default_extracfg = {
 #if !(CONFIG_REALTIME_ONLY)
   0, /* cpu_used      */
 #else
-  4, /* cpu_used      */
+  4,                      /* cpu_used      */
 #endif
   0, /* enable_auto_alt_ref */
   0, /* noise_sensitivity */

diff --git a/vpx_dsp/mips/inv_txfm_dspr2.h b/vpx_dsp/mips/inv_txfm_dspr2.h
index 9fa693dfcd81821a80915225b516d96032e8830f..cbea22f20f72e5d36cbd04406e44505d8253bcde 100644 (file)
--- a/vpx_dsp/mips/inv_txfm_dspr2.h
+++ b/vpx_dsp/mips/inv_txfm_dspr2.h
@@ -25,7 +25,6 @@ extern "C" {
 #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;                                                            \

diff --git a/vpx_dsp/ppc/subtract_vsx.c b/vpx_dsp/ppc/subtract_vsx.c
index 3fd4a6a2d0616e8a54ba5192d89c9ae2499b8eca..51a24151a7d611766b4c811c7eb7f41d09595132 100644 (file)
--- a/vpx_dsp/ppc/subtract_vsx.c
+++ b/vpx_dsp/ppc/subtract_vsx.c
@@ -111,7 +111,6 @@ void vpx_subtract_block_vsx(int rows, int cols, int16_t *diff,
                           pred, pred_stride);
       }
       break;
-    default:
-      assert(0);  // unreachable
+    default: assert(0);  // unreachable
   }
 }