Mercurial > libavcodec.hg

changeset 5510:37bf17e052fb libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use get_unary from bitstream.h
author alex
date Wed, 08 Aug 2007 22:36:12 +0000
parents 9fce88cf7f94
children 7617e066481e
files wavpack.c
diffstat 1 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/wavpack.c	Wed Aug 08 20:38:30 2007 +0000
+++ b/wavpack.c	Wed Aug 08 22:36:12 2007 +0000
@@ -114,12 +114,6 @@
     return neg ? -res : res;
 }
 
-static inline int get_unary(GetBitContext *gb){
-    int r=0;
-    while(get_bits1(gb) && r<33)r++;
-    return r;
-}
-
 // macros for manipulating median values
 #define GET_MED(n) ((median[n] >> 4) + 1)
 #define DEC_MED(n) median[n] -= ((median[n] + (128>>n) - 2) / (128>>n)) * 2
@@ -165,7 +159,7 @@
             if(ctx->zeroes)
                 return 0;
         }else{
-            t = get_unary(gb);
+            t = get_unary(gb, 0, 33);
             if(t >= 2) t = get_bits(gb, t - 1) | (1 << (t-1));
             ctx->zeroes = t;
             if(ctx->zeroes){
@@ -184,13 +178,13 @@
         t = 0;
         ctx->zero = 0;
     }else{
-        t = get_unary(gb);
+        t = get_unary(gb, 0, 33);
         if(get_bits_count(gb) >= ctx->data_size){
             *last = 1;
             return 0;
         }
         if(t == 16) {
-            t2 = get_unary(gb);
+            t2 = get_unary(gb, 0, 33);
             if(t2 < 2) t += t2;
             else t += get_bits(gb, t2 - 1) | (1 << (t2 - 1));
         }