|
|
|
@ -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; |
|
|
|
|
} |
|
|
|
|