Mercurial > libavcodec.hg

comparison h264.c @ 5713:f45228f65e06 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reindent
author andoma
date Tue, 25 Sep 2007 08:43:49 +0000
parents c08c9340c7ca
children 49a5d44423ef
comparison
equal deleted inserted replaced
5712:1766e8863911 5713:f45228f65e06
5632 if( cbp & (1<<i8x8) ) { 5632 if( cbp & (1<<i8x8) ) {
5633 if( IS_8x8DCT(mb_type) ) { 5633 if( IS_8x8DCT(mb_type) ) {
5634 decode_cabac_residual(h, h->mb + 64*i8x8, 5, 4*i8x8, 5634 decode_cabac_residual(h, h->mb + 64*i8x8, 5, 4*i8x8,
5635 scan8x8, h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 64); 5635 scan8x8, h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 64);
5636 } else { 5636 } else {
5637 qmul = h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale]; 5637 qmul = h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale];
5638 for( i4x4 = 0; i4x4 < 4; i4x4++ ) { 5638 for( i4x4 = 0; i4x4 < 4; i4x4++ ) {
5639 const int index = 4*i8x8 + i4x4; 5639 const int index = 4*i8x8 + i4x4;
5640 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index ); 5640 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index );
5641 //START_TIMER 5641 //START_TIMER
5642 decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, qmul, 16); 5642 decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, qmul, 16);
5643 //STOP_TIMER("decode_residual") 5643 //STOP_TIMER("decode_residual")
5644 } 5644 }
5645 } 5645 }
5646 } else { 5646 } else {
5647 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; 5647 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
5648 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; 5648 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0;
5649 } 5649 }