RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Aurelien Jacobs 2008-03-08 17:57:13 +00:00
parent 409e1d71ea
commit bac02ed3c5
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/huffman.c
View File

@ -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]);

4
libavcodec/huffman.h
View File

@ -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 */

3
libavcodec/vp6.c
View File

@ -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)