diff options
| author | clang-format <noreply@google.com> | 2016-09-15 15:07:46 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-09-15 15:07:53 -0700 |
| commit | 5f6d143b41ca45c9f823849473bb8ce5437b0659 (patch) | |
| tree | 20d52205fe6d569334cda9c4071e06c16d67976d /vp8/common | |
| parent | 30b1abd6e6763937e7145ff0886dbb138bba61b2 (diff) | |
| download | libvpx-5f6d143b41ca45c9f823849473bb8ce5437b0659.tar libvpx-5f6d143b41ca45c9f823849473bb8ce5437b0659.tar.gz libvpx-5f6d143b41ca45c9f823849473bb8ce5437b0659.tar.bz2 libvpx-5f6d143b41ca45c9f823849473bb8ce5437b0659.zip | |
apply clang-format
Change-Id: I501597b7c1e0f0c7ae2aea3ee8073f0a641b3487
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/entropymode.c | 13 | ||||
| -rw-r--r-- | vp8/common/entropymode.h | 13 | ||||
| -rw-r--r-- | vp8/common/onyxc_int.h | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/vp8/common/entropymode.c b/vp8/common/entropymode.c index 239492a8c..30c2fa86a 100644 --- a/vp8/common/entropymode.c +++ b/vp8/common/entropymode.c @@ -34,13 +34,12 @@ int vp8_mv_cont(const int_mv *l, const int_mv *a) { static const vp8_prob sub_mv_ref_prob[VP8_SUBMVREFS - 1] = { 180, 162, 25 }; -const vp8_prob vp8_sub_mv_ref_prob2[SUBMVREF_COUNT][VP8_SUBMVREFS - 1] = { - { 147, 136, 18 }, - { 106, 145, 1 }, - { 179, 121, 1 }, - { 223, 1, 34 }, - { 208, 1, 1 } -}; +const vp8_prob vp8_sub_mv_ref_prob2[SUBMVREF_COUNT] + [VP8_SUBMVREFS - 1] = { { 147, 136, 18 }, + { 106, 145, 1 }, + { 179, 121, 1 }, + { 223, 1, 34 }, + { 208, 1, 1 } }; const vp8_mbsplit vp8_mbsplits[VP8_NUMMBSPLITS] = { { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1 }, diff --git a/vp8/common/entropymode.h b/vp8/common/entropymode.h index 9331eb225..e0a17df10 100644 --- a/vp8/common/entropymode.h +++ b/vp8/common/entropymode.h @@ -40,8 +40,9 @@ extern int vp8_mv_cont(const int_mv *l, const int_mv *a); #define SUBMVREF_COUNT 5 extern const vp8_prob vp8_sub_mv_ref_prob2[SUBMVREF_COUNT][VP8_SUBMVREFS - 1]; -extern const unsigned int vp8_kf_default_bmode_counts - [VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES]; +extern const unsigned int vp8_kf_default_bmode_counts[VP8_BINTRAMODES] + [VP8_BINTRAMODES] + [VP8_BINTRAMODES]; extern const vp8_tree_index vp8_bmode_tree[]; @@ -70,15 +71,15 @@ extern const vp8_tree_index vp8_small_mvtree[]; extern const struct vp8_token_struct vp8_small_mvencodings[8]; /* Key frame default mode probs */ -extern const vp8_prob - vp8_kf_bmode_prob[VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES - 1]; +extern const vp8_prob vp8_kf_bmode_prob[VP8_BINTRAMODES][VP8_BINTRAMODES] + [VP8_BINTRAMODES - 1]; extern const vp8_prob vp8_kf_uv_mode_prob[VP8_UV_MODES - 1]; extern const vp8_prob vp8_kf_ymode_prob[VP8_YMODES - 1]; void vp8_init_mbmode_probs(VP8_COMMON *x); void vp8_default_bmode_probs(vp8_prob dest[VP8_BINTRAMODES - 1]); -void vp8_kf_default_bmode_probs( - vp8_prob dest[VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES - 1]); +void vp8_kf_default_bmode_probs(vp8_prob dest[VP8_BINTRAMODES][VP8_BINTRAMODES] + [VP8_BINTRAMODES - 1]); #ifdef __cplusplus } // extern "C" diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index 6d3de4f1a..732656f2f 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -42,8 +42,8 @@ typedef struct frame_contexts { vp8_prob ymode_prob[VP8_YMODES - 1]; /* interframe intra mode probs */ vp8_prob uv_mode_prob[VP8_UV_MODES - 1]; vp8_prob sub_mv_ref_prob[VP8_SUBMVREFS - 1]; - vp8_prob - coef_probs[BLOCK_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS][ENTROPY_NODES]; + vp8_prob coef_probs[BLOCK_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS] + [ENTROPY_NODES]; MV_CONTEXT mvc[2]; } FRAME_CONTEXT; |