diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-09-02 14:22:17 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-03 13:55:38 +0200 |
| commit | 741d353ab9cb47fe864e60552bf7b9af7aaa735b (patch) | |
| tree | 0660a0c72bf99c62f4f375d28f1fae7506eace88 /libavcodec | |
| parent | 26960aa1cd865e5dc55c67fb2ff9f0629e4d1bda (diff) | |
| download | ffmpeg-741d353ab9cb47fe864e60552bf7b9af7aaa735b.tar.gz | |
huffman: allow specifying nb_bits to ff_huff_build_tree()
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/fraps.c | 3 | ||||
| -rw-r--r-- | libavcodec/huffman.c | 8 | ||||
| -rw-r--r-- | libavcodec/huffman.h | 2 | ||||
| -rw-r--r-- | libavcodec/vp6.c | 3 |
4 files changed, 9 insertions, 7 deletions
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index d502d3da5a..bd330a3b4e 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -100,7 +100,8 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w, for (i = 0; i < 256; i++) nodes[i].count = bytestream_get_le32(&src); size -= 1024; - if ((ret = ff_huff_build_tree(s->avctx, &vlc, 256, nodes, huff_cmp, + if ((ret = ff_huff_build_tree(s->avctx, &vlc, 256, FF_HUFFMAN_BITS, + nodes, huff_cmp, FF_HUFFMAN_FLAG_ZERO_COUNT)) < 0) return ret; /* we have built Huffman table and are ready to decode plane */ diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index a55e536e0f..f13ab296a5 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -114,7 +114,7 @@ static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat, } } -static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags) +static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags, int nb_bits) { int no_zero_count = !(flags & FF_HUFFMAN_FLAG_ZERO_COUNT); uint32_t bits[256]; @@ -124,7 +124,7 @@ static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags) get_tree_codes(bits, lens, xlat, nodes, head, 0, 0, &pos, no_zero_count); - return ff_init_vlc_sparse(vlc, FF_HUFFMAN_BITS, pos, lens, 2, 2, bits, 4, 4, xlat, 1, 1, 0); + return ff_init_vlc_sparse(vlc, nb_bits, pos, lens, 2, 2, bits, 4, 4, xlat, 1, 1, 0); } @@ -132,7 +132,7 @@ static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags) * nodes size must be 2*nb_codes * first nb_codes nodes.count must be set */ -int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, +int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bits, Node *nodes, HuffCmp cmp, int flags) { int i, j; @@ -169,7 +169,7 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, } 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, nb_bits) < 0) { av_log(avctx, AV_LOG_ERROR, "Error building tree\n"); return -1; } diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h index 9b41ad757c..c9eeb3736b 100644 --- a/libavcodec/huffman.h +++ b/libavcodec/huffman.h @@ -40,7 +40,7 @@ typedef struct Node { #define FF_HUFFMAN_BITS 10 typedef int (*HuffCmp)(const void *va, const void *vb); -int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, +int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bits, Node *nodes, HuffCmp cmp, int flags); void ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats); diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 5026c2a7ba..c48c2b8180 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -252,7 +252,8 @@ static int vp6_build_huff_tree(VP56Context *s, uint8_t coeff_model[], ff_free_vlc(vlc); /* then build the huffman tree according to probabilities */ - return ff_huff_build_tree(s->avctx, vlc, size, nodes, vp6_huff_cmp, + return ff_huff_build_tree(s->avctx, vlc, size, FF_HUFFMAN_BITS, + nodes, vp6_huff_cmp, FF_HUFFMAN_FLAG_HNODE_FIRST); } |