From bda8d61ed19d4a9d328ef8d0b28a9829326888b0 Mon Sep 17 00:00:00 2001 From: clang-format Date: Mon, 19 Sep 2016 15:55:46 -0700 Subject: [PATCH] apply clang-format after 5cd2ab9 Change-Id: I186e90d99cd54e66d38159b7cb55a881226b1568 --- aom_dsp/psnr.c | 12 +++++------- aom_dsp/psnr.h | 9 ++++----- av1/common/entropymode.c | 5 ++--- av1/common/restoration.c | 4 ++-- av1/common/restoration.h | 6 +++--- av1/decoder/decodeframe.c | 34 ++++++++++++++-------------------- av1/encoder/bitstream.c | 13 ++++++------- 7 files changed, 36 insertions(+), 47 deletions(-) diff --git a/aom_dsp/psnr.c b/aom_dsp/psnr.c index db789a33e..93899ba24 100644 --- a/aom_dsp/psnr.c +++ b/aom_dsp/psnr.c @@ -178,8 +178,8 @@ static int64_t highbd_get_sse(const uint8_t *a, int a_stride, const uint8_t *b, #endif // CONFIG_AOM_HIGHBITDEPTH int64_t aom_get_y_sse_part(const YV12_BUFFER_CONFIG *a, - const YV12_BUFFER_CONFIG *b, - int hstart, int width, int vstart, int height) { + const YV12_BUFFER_CONFIG *b, int hstart, int width, + int vstart, int height) { return get_sse(a->y_buffer + vstart * a->y_stride + hstart, a->y_stride, b->y_buffer + vstart * b->y_stride + hstart, b->y_stride, width, height); @@ -214,13 +214,11 @@ int64_t aom_get_v_sse(const YV12_BUFFER_CONFIG *a, #if CONFIG_AOM_HIGHBITDEPTH int64_t aom_highbd_get_y_sse_part(const YV12_BUFFER_CONFIG *a, - const YV12_BUFFER_CONFIG *b, - int hstart, int width, - int vstart, int height) { + const YV12_BUFFER_CONFIG *b, int hstart, + int width, int vstart, int height) { return highbd_get_sse( a->y_buffer + vstart * a->y_stride + hstart, a->y_stride, - b->y_buffer + vstart * b->y_stride + hstart, b->y_stride, - width, height); + b->y_buffer + vstart * b->y_stride + hstart, b->y_stride, width, height); } int64_t aom_highbd_get_y_sse(const YV12_BUFFER_CONFIG *a, diff --git a/aom_dsp/psnr.h b/aom_dsp/psnr.h index 303573bbd..1cd6b1969 100644 --- a/aom_dsp/psnr.h +++ b/aom_dsp/psnr.h @@ -36,16 +36,15 @@ typedef struct { */ double aom_sse_to_psnr(double samples, double peak, double sse); int64_t aom_get_y_sse_part(const YV12_BUFFER_CONFIG *a, - const YV12_BUFFER_CONFIG *b, - int hstart, int width, int vstart, int height); + const YV12_BUFFER_CONFIG *b, int hstart, int width, + int vstart, int height); int64_t aom_get_y_sse(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b); int64_t aom_get_u_sse(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b); int64_t aom_get_v_sse(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b); #if CONFIG_AOM_HIGHBITDEPTH int64_t aom_highbd_get_y_sse_part(const YV12_BUFFER_CONFIG *a, - const YV12_BUFFER_CONFIG *b, - int hstart, int width, - int vstart, int height); + const YV12_BUFFER_CONFIG *b, int hstart, + int width, int vstart, int height); int64_t aom_highbd_get_y_sse(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b); int64_t aom_highbd_get_u_sse(const YV12_BUFFER_CONFIG *a, diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c index 61a2c315f..a999950f6 100644 --- a/av1/common/entropymode.c +++ b/av1/common/entropymode.c @@ -868,12 +868,11 @@ static const aom_prob default_tx_size_prob[TX_SIZES - 1][TX_SIZE_CONTEXTS] #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 5c59ddc1d..1baa5b4fc 100644 --- a/av1/common/restoration.c +++ b/av1/common/restoration.c @@ -147,8 +147,8 @@ void av1_loop_restoration_init(RestorationInternal *rst, RestorationInfo *rsi, 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 3d4802f70..b478bb845 100644 --- a/av1/common/restoration.h +++ b/av1/common/restoration.h @@ -84,9 +84,9 @@ static INLINE int get_rest_tilesize(int width, int height) { 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 b4c352514..9efe01652 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c @@ -1914,8 +1914,8 @@ static void decode_restoration_mode(AV1_COMMON *cm, 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 @@ static void decode_restoration(AV1_COMMON *cm, aom_reader *rb) { 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 9c01ca8d4..1033a3acb 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c @@ -2461,8 +2461,7 @@ static void encode_restoration(AV1_COMMON *cm, aom_writer *wb) { // 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 @@ static void encode_restoration(AV1_COMMON *cm, aom_writer *wb) { 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 @@ static void encode_restoration(AV1_COMMON *cm, aom_writer *wb) { 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)); } } } -- GitLab