Mercurial > libavcodec.hg
comparison h264.c @ 8377:63f491ce374b libavcodec
indent
| author | michael |
|---|---|
| date | Thu, 18 Dec 2008 02:56:44 +0000 |
| parents | e1b242224970 |
| children | 9c6512be76b4 |
comparison
equal
deleted
inserted
replaced
| 8376:e1b242224970 | 8377:63f491ce374b |
|---|---|
| 2515 if(!IS_INTRA4x4(mb_type)){ | 2515 if(!IS_INTRA4x4(mb_type)){ |
| 2516 if(is_h264){ | 2516 if(is_h264){ |
| 2517 if(IS_INTRA16x16(mb_type)){ | 2517 if(IS_INTRA16x16(mb_type)){ |
| 2518 if(transform_bypass){ | 2518 if(transform_bypass){ |
| 2519 if(h->sps.profile_idc==244 && (h->intra16x16_pred_mode==VERT_PRED8x8 || h->intra16x16_pred_mode==HOR_PRED8x8)){ | 2519 if(h->sps.profile_idc==244 && (h->intra16x16_pred_mode==VERT_PRED8x8 || h->intra16x16_pred_mode==HOR_PRED8x8)){ |
| 2520 h->hpc.pred16x16_add[h->intra16x16_pred_mode](dest_y, block_offset, h->mb, linesize); | 2520 h->hpc.pred16x16_add[h->intra16x16_pred_mode](dest_y, block_offset, h->mb, linesize); |
| 2521 }else{ | 2521 }else{ |
| 2522 for(i=0; i<16; i++){ | 2522 for(i=0; i<16; i++){ |
| 2523 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]) | 2523 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]) |
| 2524 idct_add (dest_y + block_offset[i], h->mb + i*16, linesize); | 2524 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize); |
| 2525 } | 2525 } |
| 2526 } | 2526 } |
| 2527 }else{ | 2527 }else{ |
| 2528 s->dsp.h264_idct_add16intra(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache); | 2528 s->dsp.h264_idct_add16intra(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache); |
| 2529 } | 2529 } |
| 2530 }else if(h->cbp&15){ | 2530 }else if(h->cbp&15){ |
| 2531 if(transform_bypass){ | 2531 if(transform_bypass){ |
| 2532 const int di = IS_8x8DCT(mb_type) ? 4 : 1; | 2532 const int di = IS_8x8DCT(mb_type) ? 4 : 1; |
| 2533 for(i=0; i<16; i+=di){ | 2533 for(i=0; i<16; i+=di){ |
| 2534 int nnz = h->non_zero_count_cache[ scan8[i] ]; | 2534 int nnz = h->non_zero_count_cache[ scan8[i] ]; |
| 2535 if(nnz){ | 2535 if(nnz){ |
| 2536 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize); | 2536 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize); |
| 2537 } | |
| 2537 } | 2538 } |
| 2538 } | |
| 2539 }else{ | 2539 }else{ |
| 2540 if(IS_8x8DCT(mb_type)){ | 2540 if(IS_8x8DCT(mb_type)){ |
| 2541 s->dsp.h264_idct8_add4(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache); | 2541 s->dsp.h264_idct8_add4(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache); |
| 2542 }else{ | 2542 }else{ |
| 2543 s->dsp.h264_idct_add16(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache); | 2543 s->dsp.h264_idct_add16(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache); |