avcodec/huffman/ff_huff_gen_len_table: support skiping stat=0 entries

This is probably not the simplest solution but as this is needed for a bugfix,
simplification is left for later.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/76/merge
Michael Niedermayer 11 years ago
parent 673716c54b
commit 334aafe565
  1. 23
      libavcodec/huffman.c
  2. 2
      libavcodec/huffman.h
  3. 2
      libavcodec/huffyuvenc.c
  4. 2
      libavcodec/utvideoenc.c

@ -52,12 +52,14 @@ static void heap_sift(HeapElem *h, int root, int size)
} }
} }
int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int size) int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int stats_size, int skip0)
{ {
HeapElem *h = av_malloc_array(sizeof(*h), size); HeapElem *h = av_malloc_array(sizeof(*h), stats_size);
int *up = av_malloc_array(sizeof(*up) * 2, size); int *up = av_malloc_array(sizeof(*up) * 2, stats_size);
uint8_t *len = av_malloc_array(sizeof(*len) * 2, size); uint8_t *len = av_malloc_array(sizeof(*len) * 2, stats_size);
uint16_t *map= av_malloc_array(sizeof(*map), stats_size);
int offset, i, next; int offset, i, next;
int size = 0;
int ret = 0; int ret = 0;
if (!h || !up || !len) { if (!h || !up || !len) {
@ -65,10 +67,16 @@ int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int size)
goto end; goto end;
} }
for (i = 0; i<stats_size; i++) {
dst[i] = 255;
if (stats[i] || !skip0)
map[size++] = i;
}
for (offset = 1; ; offset <<= 1) { for (offset = 1; ; offset <<= 1) {
for (i=0; i < size; i++) { for (i=0; i < size; i++) {
h[i].name = i; h[i].name = i;
h[i].val = (stats[i] << 14) + offset; h[i].val = (stats[map[i]] << 14) + offset;
} }
for (i = size / 2 - 1; i >= 0; i--) for (i = size / 2 - 1; i >= 0; i--)
heap_sift(h, i, size); heap_sift(h, i, size);
@ -89,8 +97,8 @@ int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int size)
for (i = 2 * size - 3; i >= size; i--) for (i = 2 * size - 3; i >= size; i--)
len[i] = len[up[i]] + 1; len[i] = len[up[i]] + 1;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
dst[i] = len[up[i]] + 1; dst[map[i]] = len[up[i]] + 1;
if (dst[i] >= 32) break; if (dst[map[i]] >= 32) break;
} }
if (i==size) break; if (i==size) break;
} }
@ -98,6 +106,7 @@ end:
av_free(h); av_free(h);
av_free(up); av_free(up);
av_free(len); av_free(len);
av_free(map);
return ret; return ret;
} }

@ -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);
int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int n); int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int n, int skip0);
#endif /* AVCODEC_HUFFMAN_H */ #endif /* AVCODEC_HUFFMAN_H */

@ -196,7 +196,7 @@ 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++) {
if ((ret = ff_huff_gen_len_table(s->len[i], s->stats[i], s->vlc_n)) < 0) if ((ret = ff_huff_gen_len_table(s->len[i], s->stats[i], s->vlc_n, 0)) < 0)
return ret; return ret;
if (ff_huffyuv_generate_bits_table(s->bits[i], s->len[i], s->vlc_n) < 0) { if (ff_huffyuv_generate_bits_table(s->bits[i], s->len[i], s->vlc_n) < 0) {

@ -468,7 +468,7 @@ static int encode_plane(AVCodecContext *avctx, uint8_t *src,
} }
/* Calculate huffman lengths */ /* Calculate huffman lengths */
if ((ret = ff_huff_gen_len_table(lengths, counts, 256)) < 0) if ((ret = ff_huff_gen_len_table(lengths, counts, 256, 0)) < 0)
return ret; return ret;
/* /*

Loading…
Cancel
Save