# HG changeset patch
# User alexc
# Date 1236057999 0
# Node ID fdc0db1e008710188b00df5a55c4ca8e04bd390a
# Parent  51a1ec2a637fec9c1811a86c3e31bbfb9c69b265
H.264: Simplify decode_residual()

diff -r 51a1ec2a637f -r fdc0db1e0087 h264.c
--- a/h264.c	Tue Mar 03 05:25:58 2009 +0000
+++ b/h264.c	Tue Mar 03 05:26:39 2009 +0000
@@ -4187,17 +4187,16 @@
             //first coefficient has suffix_length equal to 0 or 1
             if(prefix<14){ //FIXME try to build a large unified VLC table for all this
                 if(suffix_length)
-                    level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
+                    level_code= (prefix<<1) + get_bits1(gb); //part
                 else
-                    level_code= (prefix<<suffix_length); //part
+                    level_code= prefix; //part
             }else if(prefix==14){
                 if(suffix_length)
-                    level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
+                    level_code= (prefix<<1) + get_bits1(gb); //part
                 else
                     level_code= prefix + get_bits(gb, 4); //part
             }else{
-                level_code= (15<<suffix_length) + get_bits(gb, prefix-3); //part
-                if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense
+                level_code= 30 + get_bits(gb, prefix-3); //part
                 if(prefix>=16)
                     level_code += (1<<(prefix-3))-4096;
             }