[SCM] libav/experimental: huffman: add a zero_count flag and use it in fraps fixes issue349

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a73cbf9709cb19b4bb4bc778dd5d28cb355fdfde
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Sat Mar 8 18:08:16 2008 +0000

    huffman: add a zero_count flag and use it in fraps
    fixes issue349
    
    Originally committed as revision 12374 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index b7db219..e70d0aa 100644
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@@ -94,7 +94,8 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w,
     for(i = 0; i < 256; i++)
         nodes[i].count = bytestream_get_le32(&src);
     size -= 1024;
-    if (ff_huff_build_tree(s->avctx, &vlc, 256, nodes, huff_cmp, 0) < 0)
+    if (ff_huff_build_tree(s->avctx, &vlc, 256, nodes, huff_cmp,
+                           FF_HUFFMAN_FLAG_ZERO_COUNT) < 0)
         return -1;
     /* we have built Huffman table and are ready to decode plane */
 
diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c
index 0bc1bc6..d41dabb 100644
--- a/libavcodec/huffman.c
+++ b/libavcodec/huffman.c
@@ -28,12 +28,12 @@
 #define HNODE -1
 
 
-static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat, Node *nodes, int node, uint32_t pfx, int pl, int *pos)
+static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat, Node *nodes, int node, uint32_t pfx, int pl, int *pos, int no_zero_count)
 {
     int s;
 
     s = nodes[node].sym;
-    if(s != HNODE || !nodes[node].count){
+    if(s != HNODE || (no_zero_count && !nodes[node].count)){
         bits[*pos] = pfx;
         lens[*pos] = pl;
         xlat[*pos] = s;
@@ -41,20 +41,23 @@ static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat, Node *n
     }else{
         pfx <<= 1;
         pl++;
-        get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0, pfx, pl, pos);
+        get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0, pfx, pl, pos,
+                       no_zero_count);
         pfx |= 1;
-        get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0+1, pfx, pl, pos);
+        get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0+1, pfx, pl, pos,
+                       no_zero_count);
     }
 }
 
-static int build_huff_tree(VLC *vlc, Node *nodes, int head)
+static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags)
 {
+    int no_zero_count = !(flags & FF_HUFFMAN_FLAG_ZERO_COUNT);
     uint32_t bits[256];
     int16_t lens[256];
     uint8_t xlat[256];
     int pos = 0;
 
-    get_tree_codes(bits, lens, xlat, nodes, head, 0, 0, &pos);
+    get_tree_codes(bits, lens, xlat, nodes, head, 0, 0, &pos, no_zero_count);
     return init_vlc_sparse(vlc, 9, pos, lens, 2, 2, bits, 4, 4, xlat, 1, 1, 0);
 }
 
@@ -98,7 +101,7 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,
         }
         cur_node++;
     }
-    if(build_huff_tree(vlc, nodes, nb_codes*2-2) < 0){
+    if(build_huff_tree(vlc, nodes, nb_codes*2-2, flags) < 0){
         av_log(avctx, AV_LOG_ERROR, "Error building tree\n");
         return -1;
     }
diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index 0b6ff40..650700b 100644
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
@@ -33,6 +33,7 @@ typedef struct {
 } Node;
 
 #define FF_HUFFMAN_FLAG_HNODE_FIRST 0x01
+#define FF_HUFFMAN_FLAG_ZERO_COUNT  0x02
 
 typedef int (*huff_cmp_t)(const void *va, const void *vb);
 int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,

-- 
Libav/FFmpeg packaging