X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Funary.h;h=908dc9350786e56acc4166ec967ad7af20c34447;hb=b3507d398b703ed8f06d8608f254c3937a7a42b0;hp=195e69f906c92d023c6dcdafdc50675197e8adc5;hpb=28296f9c9e958b798c2947109ee479092c855721;p=ffmpeg

diff --git a/libavcodec/unary.h b/libavcodec/unary.h
index 195e69f906c..908dc935078 100644
--- a/libavcodec/unary.h
+++ b/libavcodec/unary.h
@@ -21,52 +21,36 @@
 #ifndef AVCODEC_UNARY_H
 #define AVCODEC_UNARY_H
 
-#include "bitstream.h"
+#include "get_bits.h"
 
 /**
  * Get unary code of limited length
- * @todo FIXME Slow and ugly
  * @param gb GetBitContext
  * @param[in] stop The bitstop value (unary code of 1's or 0's)
  * @param[in] len Maximum length
  * @return Unary length/index
  */
-static int get_unary(GetBitContext *gb, int stop, int len)
+static inline int get_unary(GetBitContext *gb, int stop, int len)
 {
-#if 1
     int i;
 
     for(i = 0; i < len && get_bits1(gb) != stop; i++);
     return i;
-/*  int i = 0, tmp = !stop;
-
-  while (i != len && tmp != stop)
-  {
-    tmp = get_bits(gb, 1);
-    i++;
-  }
-  if (i == len && tmp != stop) return len+1;
-  return i;*/
-#else
-  unsigned int buf;
-  int log;
-
-  OPEN_READER(re, gb);
-  UPDATE_CACHE(re, gb);
-  buf=GET_CACHE(re, gb); //Still not sure
-  if (stop) buf = ~buf;
+}
 
-  log= av_log2(-buf); //FIXME: -?
-  if (log < limit){
-    LAST_SKIP_BITS(re, gb, log+1);
-    CLOSE_READER(re, gb);
-    return log;
-  }
+/**
+ * Get unary code terminated by a 0 with a maximum length of 33
+ * @param gb GetBitContext
+ * @return Unary length/index
+ */
+static inline int get_unary_0_33(GetBitContext *gb)
+{
+    return get_unary(gb, 0, 33);
+}
 
-  LAST_SKIP_BITS(re, gb, limit);
-  CLOSE_READER(re, gb);
-  return limit;
-#endif
+static inline int get_unary_0_9(GetBitContext *gb)
+{
+    return get_unary(gb, 0, 9);
 }
 
 #endif /* AVCODEC_UNARY_H */