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/common | |
| 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/common')
| -rw-r--r-- | vp8/common/blockd.h | 4 | ||||
| -rw-r--r-- | vp8/common/extend.c | 3 | ||||
| -rw-r--r-- | vp8/common/modecont.c | 36 | ||||
| -rw-r--r-- | vp8/common/x86/vp8_asm_stubs.c | 8 |
4 files changed, 18 insertions, 33 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index 1a3aad16a..f8a2ec899 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -37,7 +37,9 @@ extern "C" { #define SEGMENT_DELTADATA 0 #define SEGMENT_ABSDATA 1 -typedef struct { int r, c; } POS; +typedef struct { + int r, c; +} POS; #define PLANE_TYPE_Y_NO_DC 0 #define PLANE_TYPE_Y2 1 diff --git a/vp8/common/extend.c b/vp8/common/extend.c index 2d67b516b..f4dbce2cd 100644 --- a/vp8/common/extend.c +++ b/vp8/common/extend.c @@ -20,8 +20,7 @@ static void copy_and_extend_plane(unsigned char *s, /* source */ int et, /* extend top border */ int el, /* extend left border */ int eb, /* extend bottom border */ - int er /* extend right border */ - ) { + int er) { /* extend right border */ int i; unsigned char *src_ptr1, *src_ptr2; unsigned char *dest_ptr1, *dest_ptr2; diff --git a/vp8/common/modecont.c b/vp8/common/modecont.c index d6ad9bb99..bab410374 100644 --- a/vp8/common/modecont.c +++ b/vp8/common/modecont.c @@ -11,28 +11,16 @@ #include "entropy.h" const int vp8_mode_contexts[6][4] = { - { - /* 0 */ - 7, 1, 1, 143, - }, - { - /* 1 */ - 14, 18, 14, 107, - }, - { - /* 2 */ - 135, 64, 57, 68, - }, - { - /* 3 */ - 60, 56, 128, 65, - }, - { - /* 4 */ - 159, 134, 128, 34, - }, - { - /* 5 */ - 234, 188, 128, 28, - }, + { /* 0 */ + 7, 1, 1, 143 }, + { /* 1 */ + 14, 18, 14, 107 }, + { /* 2 */ + 135, 64, 57, 68 }, + { /* 3 */ + 60, 56, 128, 65 }, + { /* 4 */ + 159, 134, 128, 34 }, + { /* 5 */ + 234, 188, 128, 28 }, }; diff --git a/vp8/common/x86/vp8_asm_stubs.c b/vp8/common/x86/vp8_asm_stubs.c index de59b3894..de836f19d 100644 --- a/vp8/common/x86/vp8_asm_stubs.c +++ b/vp8/common/x86/vp8_asm_stubs.c @@ -95,9 +95,7 @@ void vp8_sixtap_predict4x4_mmx(unsigned char *src_ptr, int src_pixels_per_line, void vp8_sixtap_predict16x16_sse2(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, - int dst_pitch - - ) { + int dst_pitch) { DECLARE_ALIGNED(16, unsigned short, FData2[24 * 24]); /* Temp data bufffer used in filtering */ @@ -236,9 +234,7 @@ extern void vp8_filter_block1d4_v6_ssse3(unsigned char *src_ptr, void vp8_sixtap_predict16x16_ssse3(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, - int dst_pitch - - ) { + int dst_pitch) { DECLARE_ALIGNED(16, unsigned char, FData2[24 * 24]); if (xoffset) { |