virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/huffman: Switch to ff_vlc_init_from_lengths()

Browse Source 
Avoids having to create the codes ourselves.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-04-17 15:43:31 +02:00
parent e73c59c6c3
commit 3e21df2353
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/huffman.c
View File

@ -115,40 +115,36 @@ end:
return ret; return ret;
} }
static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat, static void get_tree_codes(int8_t *lens, uint8_t *xlat,
Node *nodes, int node, Node *nodes, int node, int pl, int *pos, int no_zero_count)
uint32_t pfx, int pl, int *pos, int no_zero_count)
{ {
int s; int s;
s = nodes[node].sym; 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; lens[*pos] = pl;
xlat[*pos] = s; xlat[*pos] = s;
(*pos)++; (*pos)++;
} else { } else {
pfx <<= 1;
pl++; pl++;
get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0, pfx, pl, get_tree_codes(lens, xlat, nodes, nodes[node].n0, pl,
pos, no_zero_count); pos, no_zero_count);
pfx |= 1; get_tree_codes(lens, xlat, nodes, nodes[node].n0 + 1, pl,
get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0 + 1, pfx, pl,
pos, no_zero_count); pos, no_zero_count);
} }
} }
static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags, int nb_bits) static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags, int nb_bits, void *logctx)
{ {
int no_zero_count = !(flags & FF_HUFFMAN_FLAG_ZERO_COUNT); int no_zero_count = !(flags & FF_HUFFMAN_FLAG_ZERO_COUNT);
uint32_t bits[256]; int8_t lens[256];
int16_t lens[256];
uint8_t xlat[256]; uint8_t xlat[256];
int pos = 0; int pos = 0;
get_tree_codes(bits, lens, xlat, nodes, head, 0, 0, get_tree_codes(lens, xlat, nodes, head, 0,
&pos, no_zero_count); &pos, no_zero_count);
return ff_vlc_init_sparse(vlc, nb_bits, pos, lens, 2, 2, bits, 4, 4, xlat, 1, 1, 0); return ff_vlc_init_from_lengths(vlc, nb_bits, pos, lens, 1,
xlat, 1, 1, 0, 0, logctx);
} }
@ -194,7 +190,7 @@ int ff_huff_build_tree(void *logctx, VLC *vlc, int nb_codes, int nb_bits,
nodes[j].n0 = i; nodes[j].n0 = i;
cur_node++; cur_node++;
} }
if (build_huff_tree(vlc, nodes, nb_codes * 2 - 2, flags, nb_bits) < 0) { if (build_huff_tree(vlc, nodes, nb_codes * 2 - 2, flags, nb_bits, logctx) < 0) {
av_log(logctx, AV_LOG_ERROR, "Error building tree\n"); av_log(logctx, AV_LOG_ERROR, "Error building tree\n");
return -1; return -1;
} }