diff options
author | clang-format <noreply@google.com> | 2016-07-13 22:26:28 -0700 |
---|---|---|
committer | James Zern <jzern@google.com> | 2016-07-15 19:28:44 -0700 |
commit | 81a67395336bdf114dc3ffbf4321d39ae26fce05 (patch) | |
tree | 1afb6aaecb33dedf4e384c05e4a60653f256fdd8 /vp8/common/treecoder.c | |
parent | 65daa4137894bd7b8bc6ec3be9fde20093ddf1c5 (diff) | |
download | libvpx-81a67395336bdf114dc3ffbf4321d39ae26fce05.tar libvpx-81a67395336bdf114dc3ffbf4321d39ae26fce05.tar.gz libvpx-81a67395336bdf114dc3ffbf4321d39ae26fce05.tar.bz2 libvpx-81a67395336bdf114dc3ffbf4321d39ae26fce05.zip |
vp8: apply clang-format
Change-Id: I7605b6678014a5426ceb45c27b54885e0c4e06ed
Diffstat (limited to 'vp8/common/treecoder.c')
-rw-r--r-- | vp8/common/treecoder.c | 158 |
1 files changed, 62 insertions, 96 deletions
diff --git a/vp8/common/treecoder.c b/vp8/common/treecoder.c index d80c64bdf..8dbe82e0a 100644 --- a/vp8/common/treecoder.c +++ b/vp8/common/treecoder.c @@ -8,7 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ - #if CONFIG_DEBUG #include <assert.h> #endif @@ -16,128 +15,95 @@ #include "treecoder.h" -static void tree2tok( - struct vp8_token_struct *const p, - vp8_tree t, - int i, - int v, - int L -) -{ - v += v; - ++L; - - do - { - const vp8_tree_index j = t[i++]; - - if (j <= 0) - { - p[-j].value = v; - p[-j].Len = L; - } - else - tree2tok(p, t, j, v, L); - } - while (++v & 1); +static void tree2tok(struct vp8_token_struct *const p, vp8_tree t, int i, int v, + int L) { + v += v; + ++L; + + do { + const vp8_tree_index j = t[i++]; + + if (j <= 0) { + p[-j].value = v; + p[-j].Len = L; + } else + tree2tok(p, t, j, v, L); + } while (++v & 1); } -void vp8_tokens_from_tree(struct vp8_token_struct *p, vp8_tree t) -{ - tree2tok(p, t, 0, 0, 0); +void vp8_tokens_from_tree(struct vp8_token_struct *p, vp8_tree t) { + tree2tok(p, t, 0, 0, 0); } void vp8_tokens_from_tree_offset(struct vp8_token_struct *p, vp8_tree t, - int offset) -{ - tree2tok(p - offset, t, 0, 0, 0); + int offset) { + tree2tok(p - offset, t, 0, 0, 0); } -static void branch_counts( - int n, /* n = size of alphabet */ - vp8_token tok [ /* n */ ], - vp8_tree tree, - unsigned int branch_ct [ /* n-1 */ ] [2], - const unsigned int num_events[ /* n */ ] -) -{ - const int tree_len = n - 1; - int t = 0; +static void branch_counts(int n, /* n = size of alphabet */ + vp8_token tok[/* n */], vp8_tree tree, + unsigned int branch_ct[/* n-1 */][2], + const unsigned int num_events[/* n */]) { + const int tree_len = n - 1; + int t = 0; #if CONFIG_DEBUG - assert(tree_len); + assert(tree_len); #endif - do - { - branch_ct[t][0] = branch_ct[t][1] = 0; - } - while (++t < tree_len); + do { + branch_ct[t][0] = branch_ct[t][1] = 0; + } while (++t < tree_len); - t = 0; + t = 0; - do - { - int L = tok[t].Len; - const int enc = tok[t].value; - const unsigned int ct = num_events[t]; + do { + int L = tok[t].Len; + const int enc = tok[t].value; + const unsigned int ct = num_events[t]; - vp8_tree_index i = 0; + vp8_tree_index i = 0; - do - { - const int b = (enc >> --L) & 1; - const int j = i >> 1; + do { + const int b = (enc >> --L) & 1; + const int j = i >> 1; #if CONFIG_DEBUG - assert(j < tree_len && 0 <= L); + assert(j < tree_len && 0 <= L); #endif - branch_ct [j] [b] += ct; - i = tree[ i + b]; - } - while (i > 0); + branch_ct[j][b] += ct; + i = tree[i + b]; + } while (i > 0); #if CONFIG_DEBUG - assert(!L); + assert(!L); #endif - } - while (++t < n); - + } while (++t < n); } +void vp8_tree_probs_from_distribution(int n, /* n = size of alphabet */ + vp8_token tok[/* n */], vp8_tree tree, + vp8_prob probs[/* n-1 */], + unsigned int branch_ct[/* n-1 */][2], + const unsigned int num_events[/* n */], + unsigned int Pfac, int rd) { + const int tree_len = n - 1; + int t = 0; -void vp8_tree_probs_from_distribution( - int n, /* n = size of alphabet */ - vp8_token tok [ /* n */ ], - vp8_tree tree, - vp8_prob probs [ /* n-1 */ ], - unsigned int branch_ct [ /* n-1 */ ] [2], - const unsigned int num_events[ /* n */ ], - unsigned int Pfac, - int rd -) -{ - const int tree_len = n - 1; - int t = 0; - - branch_counts(n, tok, tree, branch_ct, num_events); + branch_counts(n, tok, tree, branch_ct, num_events); - do - { - const unsigned int *const c = branch_ct[t]; - const unsigned int tot = c[0] + c[1]; + do { + const unsigned int *const c = branch_ct[t]; + const unsigned int tot = c[0] + c[1]; #if CONFIG_DEBUG - assert(tot < (1 << 24)); /* no overflow below */ + assert(tot < (1 << 24)); /* no overflow below */ #endif - if (tot) - { - const unsigned int p = ((c[0] * Pfac) + (rd ? tot >> 1 : 0)) / tot; - probs[t] = p < 256 ? (p ? p : 1) : 255; /* agree w/old version for now */ - } - else - probs[t] = vp8_prob_half; - } - while (++t < tree_len); + if (tot) { + const unsigned int p = ((c[0] * Pfac) + (rd ? tot >> 1 : 0)) / tot; + probs[t] = p < 256 ? (p ? p : 1) : 255; /* agree w/old version for now */ + } else + probs[t] = vp8_prob_half; + } while (++t < tree_len); } |