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

Originally committed as revision 6605 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index cec2b1fc2942c8c0c165d32fa7e8bc35dce20ee9..2f8a8d9fe7d5d6841bbb11c647163e13d03d1be8 100644 (file)
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -363,7 +363,6 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){
 
 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 @@ static int get_cabac(CABACContext *c, uint8_t * const state){
         refill2(c);
 #endif
 #endif
-//STOP_TIMER("get_cabac")
     return bit;
 }
 

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 060d38699ec34489ec6a57577a97e16f71067320..bbd179d797e27d6e73239681a9c7ccf484d0f236 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -6651,8 +6651,10 @@ decode_intra_mb:
                     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] ];