aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-10-09 18:20:00 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-10-09 18:20:00 +0000
commit1c2a417f6a51c94de6d8b64d2aecc476f89b50f1 (patch)
treecf7bb790eda7551cfb5fa871297e2714d40a392d /libavcodec
parent30dc5f56ad526410692fb60eb3cab3f50eac4aba (diff)
downloadffmpeg-1c2a417f6a51c94de6d8b64d2aecc476f89b50f1.tar.gz
move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
Originally committed as revision 6605 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/cabac.h2
-rw-r--r--libavcodec/h264.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index cec2b1fc29..2f8a8d9fe7 100644
--- 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 060d38699e..bbd179d797 100644
--- 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] ];