Commit 7b41cbac authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/huffman: extend ff_huff_gen_len_table() to allow >8bit

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent af68bd1c
...@@ -52,13 +52,18 @@ static void heap_sift(HeapElem *h, int root, int size) ...@@ -52,13 +52,18 @@ static void heap_sift(HeapElem *h, int root, int size)
} }
} }
void ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats) int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int size)
{ {
HeapElem h[256]; HeapElem *h = av_malloc(sizeof(*h) * size);
int up[2*256]; int *up = av_malloc(sizeof(*up) * 2 * size);
int len[2*256]; uint8_t *len = av_malloc(sizeof(*len) * 2 * size);
int offset, i, next; int offset, i, next;
int size = 256; int ret = 0;
if (!h || !up || !len) {
ret = AVERROR(ENOMEM);
goto end;
}
for (offset = 1; ; offset <<= 1) { for (offset = 1; ; offset <<= 1) {
for (i=0; i < size; i++) { for (i=0; i < size; i++) {
...@@ -89,6 +94,11 @@ void ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats) ...@@ -89,6 +94,11 @@ void ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats)
} }
if (i==size) break; if (i==size) break;
} }
end:
av_free(h);
av_free(up);
av_free(len);
return ret;
} }
static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat, static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat,
......
...@@ -43,6 +43,6 @@ typedef int (*HuffCmp)(const void *va, const void *vb); ...@@ -43,6 +43,6 @@ typedef int (*HuffCmp)(const void *va, const void *vb);
int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bits, int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bits,
Node *nodes, HuffCmp cmp, int flags); Node *nodes, HuffCmp cmp, int flags);
void ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats); int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int n);
#endif /* AVCODEC_HUFFMAN_H */ #endif /* AVCODEC_HUFFMAN_H */
...@@ -144,7 +144,7 @@ static int store_table(HYuvContext *s, const uint8_t *len, uint8_t *buf) ...@@ -144,7 +144,7 @@ static int store_table(HYuvContext *s, const uint8_t *len, uint8_t *buf)
static int store_huffman_tables(HYuvContext *s, uint8_t *buf) static int store_huffman_tables(HYuvContext *s, uint8_t *buf)
{ {
int i; int i, ret;
int size = 0; int size = 0;
int count = 3; int count = 3;
...@@ -152,7 +152,8 @@ static int store_huffman_tables(HYuvContext *s, uint8_t *buf) ...@@ -152,7 +152,8 @@ static int store_huffman_tables(HYuvContext *s, uint8_t *buf)
count = 1 + s->alpha + 2*s->chroma; count = 1 + s->alpha + 2*s->chroma;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
ff_huff_gen_len_table(s->len[i], s->stats[i]); if ((ret = ff_huff_gen_len_table(s->len[i], s->stats[i], 256)) < 0)
return ret;
if (ff_huffyuv_generate_bits_table(s->bits[i], s->len[i]) < 0) { if (ff_huffyuv_generate_bits_table(s->bits[i], s->len[i]) < 0) {
return -1; return -1;
......
...@@ -363,6 +363,7 @@ static int encode_plane(AVCodecContext *avctx, uint8_t *src, ...@@ -363,6 +363,7 @@ static int encode_plane(AVCodecContext *avctx, uint8_t *src,
uint32_t offset = 0, slice_len = 0; uint32_t offset = 0, slice_len = 0;
int i, sstart, send = 0; int i, sstart, send = 0;
int symbol; int symbol;
int ret;
/* Do prediction / make planes */ /* Do prediction / make planes */
switch (c->frame_pred) { switch (c->frame_pred) {
...@@ -429,7 +430,8 @@ static int encode_plane(AVCodecContext *avctx, uint8_t *src, ...@@ -429,7 +430,8 @@ static int encode_plane(AVCodecContext *avctx, uint8_t *src,
} }
/* Calculate huffman lengths */ /* Calculate huffman lengths */
ff_huff_gen_len_table(lengths, counts); if ((ret = ff_huff_gen_len_table(lengths, counts, 256)) < 0)
return ret;
/* /*
* Write the plane's header into the output packet: * Write the plane's header into the output packet:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment