diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2012-08-27 12:29:34 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2012-08-27 13:26:58 +0200 |
commit | f76e47877c0f85a3e620a1d68a083b41827d667a (patch) | |
tree | 0b97cc3ad7d5ee907c1bf015ed309949ff77fc50 /libavcodec | |
parent | 125c6c07525a7153957d70a1bb5b732f113d1480 (diff) | |
download | ffmpeg-streaming-f76e47877c0f85a3e620a1d68a083b41827d667a.zip ffmpeg-streaming-f76e47877c0f85a3e620a1d68a083b41827d667a.tar.gz |
huffman: update to current coding style
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/huffman.c | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index 9446332..676fffe 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -31,24 +31,26 @@ #define HNODE -1 -static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat, Node *nodes, int node, uint32_t pfx, int pl, int *pos, int no_zero_count) +static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat, + Node *nodes, int node, + uint32_t pfx, int pl, int *pos, int no_zero_count) { int s; s = nodes[node].sym; - if(s != HNODE || (no_zero_count && !nodes[node].count)){ + if (s != HNODE || (no_zero_count && !nodes[node].count)) { bits[*pos] = pfx; lens[*pos] = pl; xlat[*pos] = s; (*pos)++; - }else{ + } else { pfx <<= 1; pl++; - get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0, pfx, pl, pos, - no_zero_count); + get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0, pfx, pl, + pos, no_zero_count); pfx |= 1; - get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0+1, pfx, pl, pos, - no_zero_count); + get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0 + 1, pfx, pl, + pos, no_zero_count); } } @@ -60,7 +62,8 @@ static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags) uint8_t xlat[256]; int pos = 0; - get_tree_codes(bits, lens, xlat, nodes, head, 0, 0, &pos, no_zero_count); + get_tree_codes(bits, lens, xlat, nodes, head, 0, 0, + &pos, no_zero_count); return ff_init_vlc_sparse(vlc, 9, pos, lens, 2, 2, bits, 4, 4, xlat, 1, 1, 0); } @@ -76,35 +79,37 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int cur_node; int64_t sum = 0; - for(i = 0; i < nb_codes; i++){ + for (i = 0; i < nb_codes; i++) { nodes[i].sym = i; nodes[i].n0 = -2; sum += nodes[i].count; } - if(sum >> 31) { - av_log(avctx, AV_LOG_ERROR, "Too high symbol frequencies. Tree construction is not possible\n"); + if (sum >> 31) { + av_log(avctx, AV_LOG_ERROR, + "Too high symbol frequencies. " + "Tree construction is not possible\n"); return -1; } qsort(nodes, nb_codes, sizeof(Node), cmp); cur_node = nb_codes; nodes[nb_codes*2-1].count = 0; - for(i = 0; i < nb_codes*2-1; i += 2){ + for (i = 0; i < nb_codes * 2 - 1; i += 2) { nodes[cur_node].sym = HNODE; - nodes[cur_node].count = nodes[i].count + nodes[i+1].count; + nodes[cur_node].count = nodes[i].count + nodes[i + 1].count; nodes[cur_node].n0 = i; - for(j = cur_node; j > 0; j--){ - if(nodes[j].count > nodes[j-1].count || - (nodes[j].count == nodes[j-1].count && - (!(flags & FF_HUFFMAN_FLAG_HNODE_FIRST) || - nodes[j].n0==j-1 || nodes[j].n0==j-2 || - (nodes[j].sym!=HNODE && nodes[j-1].sym!=HNODE)))) + for (j = cur_node; j > 0; j--) { + if (nodes[j].count > nodes[j - 1].count || + (nodes[j].count == nodes[j - 1].count && + (!(flags & FF_HUFFMAN_FLAG_HNODE_FIRST) || + nodes[j].n0 == j - 1 || nodes[j].n0 == j - 2 || + (nodes[j].sym!=HNODE && nodes[j-1].sym!=HNODE)))) break; - FFSWAP(Node, nodes[j], nodes[j-1]); + FFSWAP(Node, nodes[j], nodes[j - 1]); } cur_node++; } - if(build_huff_tree(vlc, nodes, nb_codes*2-2, flags) < 0){ + if (build_huff_tree(vlc, nodes, nb_codes * 2 - 2, flags) < 0) { av_log(avctx, AV_LOG_ERROR, "Error building tree\n"); return -1; } |