[FFmpeg-cvslog] r17750 - trunk/libavcodec/h264.c

alexc subversion
Tue Mar 3 06:26:40 CET 2009


Author: alexc
Date: Tue Mar  3 06:26:39 2009
New Revision: 17750

Log:
H.264: Simplify decode_residual()

Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Tue Mar  3 06:25:58 2009	(r17749)
+++ trunk/libavcodec/h264.c	Tue Mar  3 06:26:39 2009	(r17750)
@@ -4187,17 +4187,16 @@ static int decode_residual(H264Context *
             //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;
             }




More information about the ffmpeg-cvslog mailing list