[Ffmpeg-cvslog] r6605 - in trunk/libavcodec: cabac.h h264.c

[michael]

Author: michael
Date: Mon Oct  9 20:20:00 2006
New Revision: 6605

Modified:
   trunk/libavcodec/cabac.h
   trunk/libavcodec/h264.c

Log:
move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...


Modified: trunk/libavcodec/cabac.h
==============================================================================
--- trunk/libavcodec/cabac.h	(original)
+++ trunk/libavcodec/cabac.h	Mon Oct  9 20:20:00 2006
@@ -363,7 +363,6 @@
 
 static int get_cabac(CABACContext *c, uint8_t * const state){
     //FIXME gcc generates duplicate load/stores for c->low and c->range
-//START_TIMER
 #ifdef ARCH_X86
     int bit;
 
@@ -486,7 +485,6 @@
         refill2(c);
 #endif
 #endif
-//STOP_TIMER("get_cabac")
     return bit;
 }
 

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Mon Oct  9 20:20:00 2006
@@ -6651,8 +6651,10 @@
                     for( i4x4 = 0; i4x4 < 4; i4x4++ ) {
                         const int index = 4*i8x8 + i4x4;
                         //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index );
+//START_TIMER
                         if( decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale], 16) < 0 )
                             return -1;
+//STOP_TIMER("decode_residual")
                     }
                 } else {
                     uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];