From: Johann <johann.koenig@duck.com>
Date: Tue, 25 Sep 2018 01:31:35 +0000 (-0700)
Subject: clang-format v6.0.1
X-Git-Tag: v1.8.0~290^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08e6fd2fbb61f3e8f3fdb40f553b7146e3dce88c;p=libvpx

clang-format v6.0.1

Change-Id: I83c7e64fe70f7c49aa2492ed2d640c6756b7ebaa
---

diff --git a/test/dct_partial_test.cc b/test/dct_partial_test.cc
index 6636f566b..ee23ebe5c 100644
--- 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 d696d8217..e7883c141 100644
--- 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 f6b4df07e..a4fcd352f 100644
--- 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 f470cc699..e06241ab8 100644
--- 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 e1c31341b..b5f96a17e 100644
--- 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 9fa693dfc..cbea22f20 100644
--- 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 3fd4a6a2d..51a24151a 100644
--- 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
   }
 }