Browse Source
move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
Originally committed as revision 6605 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
Michael Niedermayer
19 years ago
2 changed files with 2 additions and 2 deletions
Unified View
Diff Options
-
+0 -2libavcodec/cabac.h
-
+2 -0libavcodec/h264.c
+ 0
- 2
libavcodec/cabac.h
View File
| @@ -363,7 +363,6 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ | |||||
| static int get_cabac(CABACContext *c, uint8_t * const state){ | static int get_cabac(CABACContext *c, uint8_t * const state){ | ||||
| //FIXME gcc generates duplicate load/stores for c->low and c->range | //FIXME gcc generates duplicate load/stores for c->low and c->range | ||||
| //START_TIMER | |||||
| #ifdef ARCH_X86 | #ifdef ARCH_X86 | ||||
| int bit; | int bit; | ||||
| @@ -486,7 +485,6 @@ static int get_cabac(CABACContext *c, uint8_t * const state){ | |||||
| refill2(c); | refill2(c); | ||||
| #endif | #endif | ||||
| #endif | #endif | ||||
| //STOP_TIMER("get_cabac") | |||||
| return bit; | return bit; | ||||
| } | } | ||||
+ 2
- 0
libavcodec/h264.c
View File
| @@ -6651,8 +6651,10 @@ decode_intra_mb: | |||||
| for( i4x4 = 0; i4x4 < 4; i4x4++ ) { | for( i4x4 = 0; i4x4 < 4; i4x4++ ) { | ||||
| const int index = 4*i8x8 + i4x4; | const int index = 4*i8x8 + i4x4; | ||||
| //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index ); | //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 ) | 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; | return -1; | ||||
| //STOP_TIMER("decode_residual") | |||||
| } | } | ||||
| } else { | } else { | ||||
| uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | ||||