diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-09-25 17:19:34 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-10-01 10:24:28 +0200 |
| commit | 6f6b0311a339c748b7be5bc15bd496321b3261b2 (patch) | |
| tree | 1e79ce99d60cc438d0ea6392ad6920a21f3a9efa /libavcodec/h264_cabac.c | |
| parent | 72eaba5e4ffeba16ec0a7ee7a042b3205840b1d1 (diff) | |
| download | ffmpeg-6f6b0311a339c748b7be5bc15bd496321b3261b2.tar.gz | |
avcodec: Drop some silly commented-out av_log() invocations
Diffstat (limited to 'libavcodec/h264_cabac.c')
| -rw-r--r-- | libavcodec/h264_cabac.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 2bf08b5221..88bcc734bb 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1815,7 +1815,6 @@ static av_always_inline void decode_cabac_luma_residual( H264Context *h, const u MpegEncContext * const s = &h->s; int qscale = p == 0 ? s->qscale : h->chroma_qp[p-1]; if( IS_INTRA16x16( mb_type ) ) { - //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" ); AV_ZERO128(h->mb_luma_dc[p]+0); AV_ZERO128(h->mb_luma_dc[p]+8); AV_ZERO128(h->mb_luma_dc[p]+16); @@ -1826,7 +1825,6 @@ static av_always_inline void decode_cabac_luma_residual( H264Context *h, const u qmul = h->dequant4_coeff[p][qscale]; for( i4x4 = 0; i4x4 < 16; i4x4++ ) { const int index = 16*p + i4x4; - //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", index ); decode_cabac_residual_nondc(h, h->mb + (16*index << pixel_shift), ctx_cat[1][p], index, scan + 1, qmul, 15); } } else { @@ -1844,7 +1842,6 @@ static av_always_inline void decode_cabac_luma_residual( H264Context *h, const u qmul = h->dequant4_coeff[cqm][qscale]; for( i4x4 = 0; i4x4 < 4; i4x4++ ) { const int index = 16*p + 4*i8x8 + i4x4; - //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index ); //START_TIMER decode_cabac_residual_nondc(h, h->mb + (16*index << pixel_shift), ctx_cat[2][p], index, scan, qmul, 16); //STOP_TIMER("decode_residual") @@ -2351,12 +2348,10 @@ decode_intra_mb: } else if (CHROMA422) { if( cbp&0x30 ){ int c; - for( c = 0; c < 2; c++ ) { - //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c ); + for (c = 0; c < 2; c++) decode_cabac_residual_dc_422(h, h->mb + ((256 + 16*16*c) << pixel_shift), 3, CHROMA_DC_BLOCK_INDEX + c, chroma422_dc_scan, 8); - } } if( cbp&0x20 ) { @@ -2367,7 +2362,6 @@ decode_intra_mb: for (i8x8 = 0; i8x8 < 2; i8x8++) { for (i = 0; i < 4; i++) { const int index = 16 + 16 * c + 8*i8x8 + i; - //av_log(s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16); decode_cabac_residual_nondc(h, mb, 4, index, scan + 1, qmul, 15); mb += 16<<pixel_shift; } @@ -2380,10 +2374,8 @@ decode_intra_mb: } else /* yuv420 */ { if( cbp&0x30 ){ int c; - for( c = 0; c < 2; c++ ) { - //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c ); + for (c = 0; c < 2; c++) decode_cabac_residual_dc(h, h->mb + ((256 + 16*16*c) << pixel_shift), 3, CHROMA_DC_BLOCK_INDEX+c, chroma_dc_scan, 4); - } } if( cbp&0x20 ) { @@ -2392,7 +2384,6 @@ decode_intra_mb: qmul = h->dequant4_coeff[c+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp[c]]; for( i = 0; i < 4; i++ ) { const int index = 16 + 16 * c + i; - //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 ); decode_cabac_residual_nondc(h, h->mb + (16*index << pixel_shift), 4, index, scan + 1, qmul, 15); } } |