diff options
| author | clang-format <noreply@google.com> | 2017-02-13 20:06:18 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2017-02-14 12:45:52 -0800 |
| commit | 4b402746cad6f9dbebbb3c3b79a2da098385d46f (patch) | |
| tree | 2aaf26124679e2317f031b14d4cba46502c98a01 /vp9/common | |
| parent | f670628ca546883b1989203a38835c27d3e130b7 (diff) | |
| download | libvpx-4b402746cad6f9dbebbb3c3b79a2da098385d46f.tar libvpx-4b402746cad6f9dbebbb3c3b79a2da098385d46f.tar.gz libvpx-4b402746cad6f9dbebbb3c3b79a2da098385d46f.tar.bz2 libvpx-4b402746cad6f9dbebbb3c3b79a2da098385d46f.zip | |
apply clang-format
Change-Id: I75e4a9e0b37bd4586f26c8d6c1fa27f3f6ff1bce
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_blockd.c | 5 | ||||
| -rw-r--r-- | vp9/common/vp9_entropymode.c | 46 |
2 files changed, 26 insertions, 25 deletions
diff --git a/vp9/common/vp9_blockd.c b/vp9/common/vp9_blockd.c index b0249687f..432759951 100644 --- a/vp9/common/vp9_blockd.c +++ b/vp9/common/vp9_blockd.c @@ -53,8 +53,9 @@ void vp9_foreach_transformed_block_in_plane( // the current block size extends into the UMV and we won't // visit the sub blocks that are wholly within the UMV. const int max_blocks_wide = - num_4x4_w + (xd->mb_to_right_edge >= 0 ? 0 : xd->mb_to_right_edge >> - (5 + pd->subsampling_x)); + num_4x4_w + (xd->mb_to_right_edge >= 0 + ? 0 + : xd->mb_to_right_edge >> (5 + pd->subsampling_x)); const int max_blocks_high = num_4x4_h + (xd->mb_to_bottom_edge >= 0 ? 0 diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index 22365efc5..bcb9e8f29 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -179,29 +179,29 @@ static const vpx_prob default_if_uv_probs[INTRA_MODES][INTRA_MODES - 1] = { { 101, 21, 107, 181, 192, 103, 19, 67, 125 } // y = tm }; -const vpx_prob vp9_kf_partition_probs[PARTITION_CONTEXTS] - [PARTITION_TYPES - 1] = { - // 8x8 -> 4x4 - { 158, 97, 94 }, // a/l both not split - { 93, 24, 99 }, // a split, l not split - { 85, 119, 44 }, // l split, a not split - { 62, 59, 67 }, // a/l both split - // 16x16 -> 8x8 - { 149, 53, 53 }, // a/l both not split - { 94, 20, 48 }, // a split, l not split - { 83, 53, 24 }, // l split, a not split - { 52, 18, 18 }, // a/l both split - // 32x32 -> 16x16 - { 150, 40, 39 }, // a/l both not split - { 78, 12, 26 }, // a split, l not split - { 67, 33, 11 }, // l split, a not split - { 24, 7, 5 }, // a/l both split - // 64x64 -> 32x32 - { 174, 35, 49 }, // a/l both not split - { 68, 11, 27 }, // a split, l not split - { 57, 15, 9 }, // l split, a not split - { 12, 3, 3 }, // a/l both split - }; +const vpx_prob vp9_kf_partition_probs[PARTITION_CONTEXTS][PARTITION_TYPES - 1] = + { + // 8x8 -> 4x4 + { 158, 97, 94 }, // a/l both not split + { 93, 24, 99 }, // a split, l not split + { 85, 119, 44 }, // l split, a not split + { 62, 59, 67 }, // a/l both split + // 16x16 -> 8x8 + { 149, 53, 53 }, // a/l both not split + { 94, 20, 48 }, // a split, l not split + { 83, 53, 24 }, // l split, a not split + { 52, 18, 18 }, // a/l both split + // 32x32 -> 16x16 + { 150, 40, 39 }, // a/l both not split + { 78, 12, 26 }, // a split, l not split + { 67, 33, 11 }, // l split, a not split + { 24, 7, 5 }, // a/l both split + // 64x64 -> 32x32 + { 174, 35, 49 }, // a/l both not split + { 68, 11, 27 }, // a split, l not split + { 57, 15, 9 }, // l split, a not split + { 12, 3, 3 }, // a/l both split + }; static const vpx_prob default_partition_probs[PARTITION_CONTEXTS][PARTITION_TYPES - 1] = { |