update .clang-format for clang-7
update to version 7 of clang-format
added files that are affected with format change.
BUG=http://b/120815481
Change-Id: I76107f7c921f38f54bbe80ffdf9e08ce0ff2cc69
diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index f077a4e..a2840d0 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -2017,8 +2017,8 @@
MV *best_mv = &x->best_mv.as_mv;
unsigned int best_sad = INT_MAX;
int i, j;
- uint8_t do_refine_search_grid[SEARCH_GRID_STRIDE_8P * SEARCH_GRID_STRIDE_8P] =
- { 0 };
+ uint8_t do_refine_search_grid[SEARCH_GRID_STRIDE_8P *
+ SEARCH_GRID_STRIDE_8P] = { 0 };
int grid_center = SEARCH_GRID_CENTER_8P;
int grid_coord = grid_center;
diff --git a/av1/encoder/pustats.h b/av1/encoder/pustats.h
index 40dd467..2e87101 100644
--- a/av1/encoder/pustats.h
+++ b/av1/encoder/pustats.h
@@ -43,8 +43,8 @@
-1.0533f, -0.3566f, 0.5294f, -0.4335f, 0.1626f,
};
-static const float av1_pustats_rate_hiddenlayer_0_bias[HIDDEN_LAYERS_0_NODES] =
- {
+static const float
+ av1_pustats_rate_hiddenlayer_0_bias[HIDDEN_LAYERS_0_NODES] = {
10.5266f, 5.3268f, -1.0678f, 7.7411f, 8.7164f, -0.3235f,
7.3028f, 9.0874f, -6.4594f, -1.0102f, -1.1146f, 10.8419f,
};
@@ -72,8 +72,8 @@
-2.7566f,
};
-static const float av1_pustats_rate_hiddenlayer_1_bias[HIDDEN_LAYERS_1_NODES] =
- {
+static const float
+ av1_pustats_rate_hiddenlayer_1_bias[HIDDEN_LAYERS_1_NODES] = {
13.2435f, -8.5477f, -0.0998f, -1.5131f, -12.0187f,
6.1715f, 0.5094f, 7.6433f, -0.3992f, -1.3555f,
};
@@ -124,8 +124,8 @@
-0.0806f, 0.5231f, 0.3928f, 0.4146f, 2.0956f,
};
-static const float av1_pustats_dist_hiddenlayer_0_bias[HIDDEN_LAYERS_0_NODES] =
- {
+static const float
+ av1_pustats_dist_hiddenlayer_0_bias[HIDDEN_LAYERS_0_NODES] = {
1.1597f, 0.0836f, -0.7471f, -0.2439f, -0.0438f, 2.4626f,
0.f, 1.1485f, 2.7085f, -4.7897f, 1.4093f, -1.657f,
};
@@ -153,8 +153,8 @@
-0.4164f,
};
-static const float av1_pustats_dist_hiddenlayer_1_bias[HIDDEN_LAYERS_1_NODES] =
- {
+static const float
+ av1_pustats_dist_hiddenlayer_1_bias[HIDDEN_LAYERS_1_NODES] = {
-2.3014f, -2.4292f, 1.3317f, -3.2361f, -1.918f,
2.7149f, -2.5649f, 2.7765f, 2.9617f, 2.7684f,
};
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index d78e269..7c52b21 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -52,20 +52,20 @@
2, 3, 3, 4, 6, 6, 8, 12, 12, 16, 24, 24, 32, 48, 48, 64, 4, 4, 8, 8, 16, 16
};
-static const int use_intra_ext_tx_for_txsize[EXT_TX_SETS_INTRA][EXT_TX_SIZES] =
- {
- { 1, 1, 1, 1 }, // unused
- { 1, 1, 0, 0 },
- { 0, 0, 1, 0 },
- };
+static const int use_intra_ext_tx_for_txsize[EXT_TX_SETS_INTRA]
+ [EXT_TX_SIZES] = {
+ { 1, 1, 1, 1 }, // unused
+ { 1, 1, 0, 0 },
+ { 0, 0, 1, 0 },
+ };
-static const int use_inter_ext_tx_for_txsize[EXT_TX_SETS_INTER][EXT_TX_SIZES] =
- {
- { 1, 1, 1, 1 }, // unused
- { 1, 1, 0, 0 },
- { 0, 0, 1, 0 },
- { 0, 0, 0, 1 },
- };
+static const int use_inter_ext_tx_for_txsize[EXT_TX_SETS_INTER]
+ [EXT_TX_SIZES] = {
+ { 1, 1, 1, 1 }, // unused
+ { 1, 1, 0, 0 },
+ { 0, 0, 1, 0 },
+ { 0, 0, 0, 1 },
+ };
static const int av1_ext_tx_set_idx_to_type[2][AOMMAX(EXT_TX_SETS_INTRA,
EXT_TX_SETS_INTER)] = {
@@ -343,9 +343,9 @@
static const int rd_boost_factor[16] = { 64, 32, 32, 32, 24, 16, 12, 12,
8, 8, 4, 4, 2, 2, 1, 0 };
-static const int rd_frame_type_factor[FRAME_UPDATE_TYPES] = {
- 128, 144, 128, 128, 144, 144, 128
-};
+static const int rd_frame_type_factor[FRAME_UPDATE_TYPES] = { 128, 144, 128,
+ 128, 144, 144,
+ 128 };
int av1_compute_rd_mult_based_on_qindex(const AV1_COMP *cpi, int qindex) {
const int q = av1_dc_quant_Q3(qindex, 0, cpi->common.seq_params.bit_depth);
@@ -795,9 +795,9 @@
},
};
-static const double surffit_dist_params[7] = {
- 1.475844, 4.328362, -5.680233, -0.500994, 0.554585, 4.839478, -0.695837
-};
+static const double surffit_dist_params[7] = { 1.475844, 4.328362, -5.680233,
+ -0.500994, 0.554585, 4.839478,
+ -0.695837 };
static void rate_surffit_model_params_lookup(BLOCK_SIZE bsize, double xm,
double *rpar) {
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 688bc16..571687a 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -29,9 +29,9 @@
{ { 64, 16 }, { 24, 8 }, { 12, 4 }, { 7, 1 } },
{ { 64, 16 }, { 24, 8 }, { 12, 4 }, { 7, 1 } },
};
-static unsigned char good_quality_max_mesh_pct[MAX_MESH_SPEED + 1] = {
- 50, 50, 25, 15, 5, 1
-};
+static unsigned char good_quality_max_mesh_pct[MAX_MESH_SPEED + 1] = { 50, 50,
+ 25, 15,
+ 5, 1 };
// TODO(huisu@google.com): These settings are pretty relaxed, tune them for
// each speed setting
diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c
index ba883d7..9135750 100644
--- a/av1/encoder/temporal_filter.c
+++ b/av1/encoder/temporal_filter.c
@@ -37,9 +37,9 @@
#define EDGE_THRESHOLD 50
#define SQRT_PI_BY_2 1.25331413732
-static unsigned int index_mult[14] = {
- 0, 0, 0, 0, 49152, 39322, 32768, 28087, 24576, 21846, 19661, 17874, 0, 15124
-};
+static unsigned int index_mult[14] = { 0, 0, 0, 0, 49152,
+ 39322, 32768, 28087, 24576, 21846,
+ 19661, 17874, 0, 15124 };
static int64_t highbd_index_mult[14] = { 0U, 0U, 0U,
0U, 3221225472U, 2576980378U,
diff --git a/av1/encoder/x86/corner_match_avx2.c b/av1/encoder/x86/corner_match_avx2.c
index 7a3b999..554122b 100644
--- a/av1/encoder/x86/corner_match_avx2.c
+++ b/av1/encoder/x86/corner_match_avx2.c
@@ -17,9 +17,9 @@
#include "aom_ports/mem.h"
#include "av1/encoder/corner_match.h"
-DECLARE_ALIGNED(16, static const uint8_t, byte_mask[16]) = {
- 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0
-};
+DECLARE_ALIGNED(16, static const uint8_t,
+ byte_mask[16]) = { 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255, 0, 0, 0 };
#if MATCH_SZ != 13
#error "Need to change byte_mask in corner_match_sse4.c if MATCH_SZ != 13"
#endif
diff --git a/av1/encoder/x86/corner_match_sse4.c b/av1/encoder/x86/corner_match_sse4.c
index 93f37b7..1b5f470 100644
--- a/av1/encoder/x86/corner_match_sse4.c
+++ b/av1/encoder/x86/corner_match_sse4.c
@@ -21,9 +21,9 @@
#include "aom_ports/mem.h"
#include "av1/encoder/corner_match.h"
-DECLARE_ALIGNED(16, static const uint8_t, byte_mask[16]) = {
- 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0
-};
+DECLARE_ALIGNED(16, static const uint8_t,
+ byte_mask[16]) = { 255, 255, 255, 255, 255, 255, 255, 255,
+ 255, 255, 255, 255, 255, 0, 0, 0 };
#if MATCH_SZ != 13
#error "Need to change byte_mask in corner_match_sse4.c if MATCH_SZ != 13"
#endif
diff --git a/av1/encoder/x86/temporal_filter_constants.h b/av1/encoder/x86/temporal_filter_constants.h
index b3a10dd..7cd61d7 100644
--- a/av1/encoder/x86/temporal_filter_constants.h
+++ b/av1/encoder/x86/temporal_filter_constants.h
@@ -373,29 +373,35 @@
HIGHBD_RIGHT_CORNER_NEIGHBORS_PLUS_1, HIGHBD_RIGHT_EDGE_NEIGHBORS_PLUS_1
};
-static const uint32_t *const HIGHBD_CHROMA_SINGLE_SS_LEFT_COLUMN_NEIGHBORS[2] =
- { HIGHBD_LEFT_CORNER_NEIGHBORS_PLUS_2, HIGHBD_LEFT_EDGE_NEIGHBORS_PLUS_2 };
+static const uint32_t
+ *const HIGHBD_CHROMA_SINGLE_SS_LEFT_COLUMN_NEIGHBORS[2] = {
+ HIGHBD_LEFT_CORNER_NEIGHBORS_PLUS_2, HIGHBD_LEFT_EDGE_NEIGHBORS_PLUS_2
+ };
static const uint32_t
*const HIGHBD_CHROMA_SINGLE_SS_MIDDLE_COLUMN_NEIGHBORS[2] = {
HIGHBD_MIDDLE_EDGE_NEIGHBORS_PLUS_2, HIGHBD_MIDDLE_CENTER_NEIGHBORS_PLUS_2
};
-static const uint32_t *const HIGHBD_CHROMA_SINGLE_SS_RIGHT_COLUMN_NEIGHBORS[2] =
- { HIGHBD_RIGHT_CORNER_NEIGHBORS_PLUS_2,
- HIGHBD_RIGHT_EDGE_NEIGHBORS_PLUS_2 };
+static const uint32_t
+ *const HIGHBD_CHROMA_SINGLE_SS_RIGHT_COLUMN_NEIGHBORS[2] = {
+ HIGHBD_RIGHT_CORNER_NEIGHBORS_PLUS_2, HIGHBD_RIGHT_EDGE_NEIGHBORS_PLUS_2
+ };
-static const uint32_t *const HIGHBD_CHROMA_DOUBLE_SS_LEFT_COLUMN_NEIGHBORS[2] =
- { HIGHBD_LEFT_CORNER_NEIGHBORS_PLUS_4, HIGHBD_LEFT_EDGE_NEIGHBORS_PLUS_4 };
+static const uint32_t
+ *const HIGHBD_CHROMA_DOUBLE_SS_LEFT_COLUMN_NEIGHBORS[2] = {
+ HIGHBD_LEFT_CORNER_NEIGHBORS_PLUS_4, HIGHBD_LEFT_EDGE_NEIGHBORS_PLUS_4
+ };
static const uint32_t
*const HIGHBD_CHROMA_DOUBLE_SS_MIDDLE_COLUMN_NEIGHBORS[2] = {
HIGHBD_MIDDLE_EDGE_NEIGHBORS_PLUS_4, HIGHBD_MIDDLE_CENTER_NEIGHBORS_PLUS_4
};
-static const uint32_t *const HIGHBD_CHROMA_DOUBLE_SS_RIGHT_COLUMN_NEIGHBORS[2] =
- { HIGHBD_RIGHT_CORNER_NEIGHBORS_PLUS_4,
- HIGHBD_RIGHT_EDGE_NEIGHBORS_PLUS_4 };
+static const uint32_t
+ *const HIGHBD_CHROMA_DOUBLE_SS_RIGHT_COLUMN_NEIGHBORS[2] = {
+ HIGHBD_RIGHT_CORNER_NEIGHBORS_PLUS_4, HIGHBD_RIGHT_EDGE_NEIGHBORS_PLUS_4
+ };
#define DIST_STRIDE ((BW) + 2)
#endif // AOM_AV1_ENCODER_X86_TEMPORAL_FILTER_CONSTANTS_H_
