[FFmpeg-cvslog] r21845 - trunk/libavcodec/h264_cabac.c

[michael]

Author: michael
Date: Tue Feb 16 03:51:37 2010
New Revision: 21845

Log:
2 cpu cycles faster context calculation for decode_cabac_intra_mb_type()

Modified:
   trunk/libavcodec/h264_cabac.c

Modified: trunk/libavcodec/h264_cabac.c
==============================================================================
--- trunk/libavcodec/h264_cabac.c	Tue Feb 16 01:09:30 2010	(r21844)
+++ trunk/libavcodec/h264_cabac.c	Tue Feb 16 03:51:37 2010	(r21845)
@@ -723,9 +723,9 @@ static int decode_cabac_intra_mb_type(H2
 
     if(intra_slice){
         int ctx=0;
-        if( h->left_type[0] && !IS_INTRA4x4(h->left_type[0]))
+        if( h->left_type[0] & (MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM))
             ctx++;
-        if( h->top_type     && !IS_INTRA4x4(h->top_type) )
+        if( h->top_type     & (MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM))
             ctx++;
         if( get_cabac_noinline( &h->cabac, &state[ctx] ) == 0 )
             return 0;   /* I4x4 */