apply clang-format after 5cd2ab9
Change-Id: I186e90d99cd54e66d38159b7cb55a881226b1568
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 61a2c31..a999950 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -868,12 +868,11 @@
#if CONFIG_LOOP_RESTORATION
const aom_tree_index
av1_switchable_restore_tree[TREE_SIZE(RESTORE_SWITCHABLE_TYPES)] = {
- -RESTORE_NONE, 2,
- -RESTORE_BILATERAL, -RESTORE_WIENER,
+ -RESTORE_NONE, 2, -RESTORE_BILATERAL, -RESTORE_WIENER,
};
static const aom_prob
- default_switchable_restore_prob[RESTORE_SWITCHABLE_TYPES - 1] = {32, 128};
+ default_switchable_restore_prob[RESTORE_SWITCHABLE_TYPES - 1] = { 32, 128 };
#endif // CONFIG_LOOP_RESTORATION
#if CONFIG_EXT_TX && CONFIG_RECT_TX && CONFIG_VAR_TX
diff --git a/av1/common/restoration.c b/av1/common/restoration.c
index 5c59ddc..1baa5b4 100644
--- a/av1/common/restoration.c
+++ b/av1/common/restoration.c
@@ -147,8 +147,8 @@
rst->subsampling_x = 0;
rst->subsampling_y = 0;
rst->ntiles =
- av1_get_rest_ntiles(width, height, &rst->tile_width,
- &rst->tile_height, &rst->nhtiles, &rst->nvtiles);
+ av1_get_rest_ntiles(width, height, &rst->tile_width, &rst->tile_height,
+ &rst->nhtiles, &rst->nvtiles);
if (rsi->frame_restoration_type == RESTORE_WIENER) {
for (tile_idx = 0; tile_idx < rst->ntiles; ++tile_idx) {
rsi->vfilter[tile_idx][RESTORATION_HALFWIN] =
diff --git a/av1/common/restoration.h b/av1/common/restoration.h
index 3d4802f..b478bb8 100644
--- a/av1/common/restoration.h
+++ b/av1/common/restoration.h
@@ -84,9 +84,9 @@
return RESTORATION_TILESIZE_BIG;
}
-static INLINE int av1_get_rest_ntiles(int width, int height,
- int *tile_width, int *tile_height,
- int *nhtiles, int *nvtiles) {
+static INLINE int av1_get_rest_ntiles(int width, int height, int *tile_width,
+ int *tile_height, int *nhtiles,
+ int *nvtiles) {
int nhtiles_, nvtiles_;
int tile_width_, tile_height_;
int tilesize = get_rest_tilesize(width, height);
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index b4c3525..9efe016 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1914,8 +1914,8 @@
static void decode_restoration(AV1_COMMON *cm, aom_reader *rb) {
int i;
RestorationInfo *rsi = &cm->rst_info;
- const int ntiles = av1_get_rest_ntiles(cm->width, cm->height,
- NULL, NULL, NULL, NULL);
+ const int ntiles =
+ av1_get_rest_ntiles(cm->width, cm->height, NULL, NULL, NULL, NULL);
if (rsi->frame_restoration_type != RESTORE_NONE) {
rsi->restoration_type = (RestorationType *)aom_realloc(
rsi->restoration_type, sizeof(*rsi->restoration_type) * ntiles);
@@ -1938,24 +1938,18 @@
rb, av1_switchable_restore_tree, cm->fc->switchable_restore_prob);
if (rsi->restoration_type[i] == RESTORE_WIENER) {
rsi->wiener_level[i] = 1;
- rsi->vfilter[i][0] =
- aom_read_literal(rb, WIENER_FILT_TAP0_BITS) +
- WIENER_FILT_TAP0_MINV;
- rsi->vfilter[i][1] =
- aom_read_literal(rb, WIENER_FILT_TAP1_BITS) +
- WIENER_FILT_TAP1_MINV;
- rsi->vfilter[i][2] =
- aom_read_literal(rb, WIENER_FILT_TAP2_BITS) +
- WIENER_FILT_TAP2_MINV;
- rsi->hfilter[i][0] =
- aom_read_literal(rb, WIENER_FILT_TAP0_BITS) +
- WIENER_FILT_TAP0_MINV;
- rsi->hfilter[i][1] =
- aom_read_literal(rb, WIENER_FILT_TAP1_BITS) +
- WIENER_FILT_TAP1_MINV;
- rsi->hfilter[i][2] =
- aom_read_literal(rb, WIENER_FILT_TAP2_BITS) +
- WIENER_FILT_TAP2_MINV;
+ rsi->vfilter[i][0] = aom_read_literal(rb, WIENER_FILT_TAP0_BITS) +
+ WIENER_FILT_TAP0_MINV;
+ rsi->vfilter[i][1] = aom_read_literal(rb, WIENER_FILT_TAP1_BITS) +
+ WIENER_FILT_TAP1_MINV;
+ rsi->vfilter[i][2] = aom_read_literal(rb, WIENER_FILT_TAP2_BITS) +
+ WIENER_FILT_TAP2_MINV;
+ rsi->hfilter[i][0] = aom_read_literal(rb, WIENER_FILT_TAP0_BITS) +
+ WIENER_FILT_TAP0_MINV;
+ rsi->hfilter[i][1] = aom_read_literal(rb, WIENER_FILT_TAP1_BITS) +
+ WIENER_FILT_TAP1_MINV;
+ rsi->hfilter[i][2] = aom_read_literal(rb, WIENER_FILT_TAP2_BITS) +
+ WIENER_FILT_TAP2_MINV;
} else if (rsi->restoration_type[i] == RESTORE_BILATERAL) {
int s;
for (s = 0; s < BILATERAL_SUBTILES; ++s) {
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 9c01ca8..1033a3a 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2461,8 +2461,7 @@
// RESTORE_SWITCHABLE
for (i = 0; i < cm->rst_internal.ntiles; ++i) {
av1_write_token(
- wb, av1_switchable_restore_tree,
- cm->fc->switchable_restore_prob,
+ wb, av1_switchable_restore_tree, cm->fc->switchable_restore_prob,
&switchable_restore_encodings[rst->restoration_type[i]]);
if (rst->restoration_type[i] == RESTORE_NONE) {
} else if (rst->restoration_type[i] == RESTORE_BILATERAL) {
@@ -2487,13 +2486,13 @@
aom_write_literal(wb, rst->vfilter[i][1] - WIENER_FILT_TAP1_MINV,
WIENER_FILT_TAP1_BITS);
aom_write_literal(wb, rst->vfilter[i][2] - WIENER_FILT_TAP2_MINV,
- WIENER_FILT_TAP2_BITS);
+ WIENER_FILT_TAP2_BITS);
aom_write_literal(wb, rst->hfilter[i][0] - WIENER_FILT_TAP0_MINV,
- WIENER_FILT_TAP0_BITS);
+ WIENER_FILT_TAP0_BITS);
aom_write_literal(wb, rst->hfilter[i][1] - WIENER_FILT_TAP1_MINV,
- WIENER_FILT_TAP1_BITS);
+ WIENER_FILT_TAP1_BITS);
aom_write_literal(wb, rst->hfilter[i][2] - WIENER_FILT_TAP2_MINV,
- WIENER_FILT_TAP2_BITS);
+ WIENER_FILT_TAP2_BITS);
}
}
} else if (rst->frame_restoration_type == RESTORE_BILATERAL) {
@@ -2505,7 +2504,7 @@
RESTORE_NONE_BILATERAL_PROB);
if (rst->bilateral_level[j] >= 0) {
aom_write_literal(wb, rst->bilateral_level[j],
- av1_bilateral_level_bits(cm));
+ av1_bilateral_level_bits(cm));
}
}
}
