[FFmpeg-cvslog] r10279 - in trunk/libavcodec: alac.c unary.h

[vitor]

Author: vitor
Date: Sat Sep  1 23:03:17 2007
New Revision: 10279

Log:
Remove reimplementation of get_unary.
Based on a patch by Alex Beregszaszi.


Modified:
   trunk/libavcodec/alac.c
   trunk/libavcodec/unary.h

Modified: trunk/libavcodec/alac.c
==============================================================================
--- trunk/libavcodec/alac.c	(original)
+++ trunk/libavcodec/alac.c	Sat Sep  1 23:03:17 2007
@@ -55,6 +55,7 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "bytestream.h"
+#include "unary.h"
 
 #define ALAC_EXTRADATA_SIZE 36
 #define MAX_CHANNELS 2
@@ -159,14 +160,12 @@ static void bastardized_rice_decompress(
     int sign_modifier = 0;
 
     for (output_count = 0; output_count < output_size; output_count++) {
-        int32_t x = 0;
+        int32_t x;
         int32_t x_modified;
         int32_t final_val;
 
         /* read x - number of 1s before 0 represent the rice */
-        while (x <= 8 && get_bits1(&alac->gb)) {
-            x++;
-        }
+        x = get_unary_0_9(&alac->gb);
 
         if (x > 8) { /* RICE THRESHOLD */
             /* use alternative encoding */
@@ -227,10 +226,7 @@ static void bastardized_rice_decompress(
 
             sign_modifier = 1;
 
-            x = 0;
-            while (x <= 8 && get_bits1(&alac->gb)) {
-                x++;
-            }
+            x = get_unary_0_9(&alac->gb);
 
             if (x > 8) {
                 block_size = get_bits(&alac->gb, 16);

Modified: trunk/libavcodec/unary.h
==============================================================================
--- trunk/libavcodec/unary.h	(original)
+++ trunk/libavcodec/unary.h	Sat Sep  1 23:03:17 2007
@@ -48,4 +48,9 @@ static inline int get_unary_0_33(GetBitC
     return get_unary(gb, 0, 33);
 }
 
+static inline int get_unary_0_9(GetBitContext *gb)
+{
+    return get_unary(gb, 0, 9);
+}
+
 #endif /* AVCODEC_UNARY_H */