diff options
| author | Johann <johannkoenig@google.com> | 2018-01-12 09:12:42 -0800 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2018-01-18 12:37:58 -0800 |
| commit | f95bf1db50cdffde0d37eeb768a9955fc423684c (patch) | |
| tree | 7d7277d753ad7927c762273bdfd239fbd788cda4 /vp8/decoder | |
| parent | 97acbbb7018deef26a52a929e61367aba5bc5118 (diff) | |
| download | libvpx-f95bf1db50cdffde0d37eeb768a9955fc423684c.tar libvpx-f95bf1db50cdffde0d37eeb768a9955fc423684c.tar.gz libvpx-f95bf1db50cdffde0d37eeb768a9955fc423684c.tar.bz2 libvpx-f95bf1db50cdffde0d37eeb768a9955fc423684c.zip | |
clang-format v5.0.0 vp8/
Allow*OnASingleLine appears to no longer apply to
typedef structs.
Adjust closing parenthesis/opening brace on functions.
Remove trailing commas to keep multiple elements on one line.
Change-Id: I6e535a8ddb15c9b3de8216ce8ddb2a18241af46c
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/ec_types.h | 4 | ||||
| -rw-r--r-- | vp8/decoder/onyxd_int.h | 4 | ||||
| -rw-r--r-- | vp8/decoder/threading.c | 21 |
3 files changed, 15 insertions, 14 deletions
diff --git a/vp8/decoder/ec_types.h b/vp8/decoder/ec_types.h index 0ab08b649..8da561f47 100644 --- a/vp8/decoder/ec_types.h +++ b/vp8/decoder/ec_types.h @@ -34,7 +34,9 @@ typedef struct { /* Structure used to hold all the overlaps of a macroblock. The overlaps of a * macroblock is further divided into block overlaps. */ -typedef struct { B_OVERLAP overlaps[16]; } MB_OVERLAP; +typedef struct { + B_OVERLAP overlaps[16]; +} MB_OVERLAP; /* Structure for keeping track of motion vectors and which reference frame they * refer to. Used for motion vector interpolation. diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h index 5ecacdbb9..3689258f1 100644 --- a/vp8/decoder/onyxd_int.h +++ b/vp8/decoder/onyxd_int.h @@ -31,7 +31,9 @@ typedef struct { void *ptr2; } DECODETHREAD_DATA; -typedef struct { MACROBLOCKD mbd; } MB_ROW_DEC; +typedef struct { + MACROBLOCKD mbd; +} MB_ROW_DEC; typedef struct { int enabled; diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index d0213f75c..aadc8dc71 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -739,24 +739,21 @@ void vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows) { /* Allocate memory for above_row buffers. */ CALLOC_ARRAY(pbi->mt_yabove_row, pc->mb_rows); for (i = 0; i < pc->mb_rows; ++i) - CHECK_MEM_ERROR( - pbi->mt_yabove_row[i], - vpx_memalign( - 16, sizeof(unsigned char) * (width + (VP8BORDERINPIXELS << 1)))); + CHECK_MEM_ERROR(pbi->mt_yabove_row[i], + vpx_memalign(16, sizeof(unsigned char) * + (width + (VP8BORDERINPIXELS << 1)))); CALLOC_ARRAY(pbi->mt_uabove_row, pc->mb_rows); for (i = 0; i < pc->mb_rows; ++i) - CHECK_MEM_ERROR( - pbi->mt_uabove_row[i], - vpx_memalign(16, - sizeof(unsigned char) * (uv_width + VP8BORDERINPIXELS))); + CHECK_MEM_ERROR(pbi->mt_uabove_row[i], + vpx_memalign(16, sizeof(unsigned char) * + (uv_width + VP8BORDERINPIXELS))); CALLOC_ARRAY(pbi->mt_vabove_row, pc->mb_rows); for (i = 0; i < pc->mb_rows; ++i) - CHECK_MEM_ERROR( - pbi->mt_vabove_row[i], - vpx_memalign(16, - sizeof(unsigned char) * (uv_width + VP8BORDERINPIXELS))); + CHECK_MEM_ERROR(pbi->mt_vabove_row[i], + vpx_memalign(16, sizeof(unsigned char) * + (uv_width + VP8BORDERINPIXELS))); /* Allocate memory for left_col buffers. */ CALLOC_ARRAY(pbi->mt_yleft_col, pc->mb_rows); |