diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-08 17:57:13 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-08 17:57:13 +0000 |
| commit | bac02ed3c5004f4944cdeb97c4341925196b50d8 (patch) | |
| tree | 51ef0c506016446ecf69dab94d3fcc0aad8e2e65 | |
| parent | 409e1d71eaf2897f97f9d95e01079f93cac266ee (diff) | |
huffman: pass hnode_first as a flag instead of as an argument on its own
Originally committed as revision 12373 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/huffman.c | 5 | ||||
| -rw-r--r-- | libavcodec/huffman.h | 4 | ||||
| -rw-r--r-- | libavcodec/vp6.c | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index 43a78558e7..0bc1bc6b0f 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -64,7 +64,7 @@ static int build_huff_tree(VLC *vlc, Node *nodes, int head) * first nb_codes nodes.count must be set */ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, - Node *nodes, huff_cmp_t cmp, int hnode_first) + Node *nodes, huff_cmp_t cmp, int flags) { int i, j; int cur_node; @@ -90,7 +90,8 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, for(j = cur_node; j > 0; j--){ if(nodes[j].count > nodes[j-1].count || (nodes[j].count == nodes[j-1].count && - (!hnode_first || nodes[j].n0==j-1 || nodes[j].n0==j-2 || + (!(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]); diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h index 57fbefa1e9..0b6ff407b9 100644 --- a/libavcodec/huffman.h +++ b/libavcodec/huffman.h @@ -32,8 +32,10 @@ typedef struct { uint32_t count; } Node; +#define FF_HUFFMAN_FLAG_HNODE_FIRST 0x01 + typedef int (*huff_cmp_t)(const void *va, const void *vb); int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, - Node *nodes, huff_cmp_t cmp, int hnode_first); + Node *nodes, huff_cmp_t cmp, int flags); #endif /* FFMPEG_HUFFMAN_H */ diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 26943e564f..1b59ecd078 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -224,7 +224,8 @@ static void vp6_build_huff_tree(vp56_context_t *s, uint8_t coeff_model[], } /* then build the huffman tree accodring to probabilities */ - ff_huff_build_tree(s->avctx, vlc, size, nodes, vp6_huff_cmp, 1); + ff_huff_build_tree(s->avctx, vlc, size, nodes, vp6_huff_cmp, + FF_HUFFMAN_FLAG_HNODE_FIRST); } static void vp6_parse_coeff_models(vp56_context_t *s) |