Use AV_GCC_VERSION_AT_LEAST() to simplify gcc version checks.

[ffmpeg] / libavcodec / huffman.c

diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c
index 43a78558e776e612f9d9fe40b64dbc471d8f0b12..f21a4f890f210b3c467e8f895d844d380a0c8526 100644 (file)
--- 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);
 }
 
@@ -64,7 +67,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, HuffCmp cmp, int flags)
 {
     int i, j;
     int cur_node;
@@ -90,14 +93,15 @@ 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]);
         }
         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;
     }