Mercurial > libavcodec.hg

comparison h264_loopfilter.c @ 11369:98970e51365a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove DECLARE_ALIGNED_{8,16} macros These macros are redundant. All uses are replaced with the generic DECLARE_ALIGNED macro instead.
author mru
date Sat, 06 Mar 2010 14:24:59 +0000
parents 10c06a9bd3d9
children 2a4dc3c0b012
comparison
equal deleted inserted replaced
11368:3d4f64b8fb10 11369:98970e51365a
475 unsigned int tmp_uvlinesize = 2 * uvlinesize; 475 unsigned int tmp_uvlinesize = 2 * uvlinesize;
476 int mbn_xy = mb_xy - 2 * s->mb_stride; 476 int mbn_xy = mb_xy - 2 * s->mb_stride;
477 int j; 477 int j;
478 478
479 for(j=0; j<2; j++, mbn_xy += s->mb_stride){ 479 for(j=0; j<2; j++, mbn_xy += s->mb_stride){
480 DECLARE_ALIGNED_8(int16_t, bS)[4]; 480 DECLARE_ALIGNED(8, int16_t, bS)[4];
481 int qp; 481 int qp;
482 if( IS_INTRA(mb_type|s->current_picture.mb_type[mbn_xy]) ) { 482 if( IS_INTRA(mb_type|s->current_picture.mb_type[mbn_xy]) ) {
483 AV_WN64A(bS, 0x0003000300030003ULL); 483 AV_WN64A(bS, 0x0003000300030003ULL);
484 } else { 484 } else {
485 if(!CABAC && IS_8x8DCT(s->current_picture.mb_type[mbn_xy])){ 485 if(!CABAC && IS_8x8DCT(s->current_picture.mb_type[mbn_xy])){
505 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1, h); 505 ( h->chroma_qp[0] + get_chroma_qp( h, 0, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1, h);
506 filter_mb_edgech( &img_cr[j*uvlinesize], tmp_uvlinesize, bS, 506 filter_mb_edgech( &img_cr[j*uvlinesize], tmp_uvlinesize, bS,
507 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1, h); 507 ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1, h);
508 } 508 }
509 }else{ 509 }else{
510 DECLARE_ALIGNED_8(int16_t, bS)[4]; 510 DECLARE_ALIGNED(8, int16_t, bS)[4];
511 int qp; 511 int qp;
512 512
513 if( IS_INTRA(mb_type|mbm_type)) { 513 if( IS_INTRA(mb_type|mbm_type)) {
514 AV_WN64A(bS, 0x0003000300030003ULL); 514 AV_WN64A(bS, 0x0003000300030003ULL);
515 if ( (!IS_INTERLACED(mb_type|mbm_type)) 515 if ( (!IS_INTERLACED(mb_type|mbm_type))
582 } 582 }
583 } 583 }
584 584
585 /* Calculate bS */ 585 /* Calculate bS */
586 for( edge = 1; edge < edges; edge++ ) { 586 for( edge = 1; edge < edges; edge++ ) {
587 DECLARE_ALIGNED_8(int16_t, bS)[4]; 587 DECLARE_ALIGNED(8, int16_t, bS)[4];
588 int qp; 588 int qp;
589 589
590 if( IS_8x8DCT(mb_type & (edge<<24)) ) // (edge&1) && IS_8x8DCT(mb_type) 590 if( IS_8x8DCT(mb_type & (edge<<24)) ) // (edge&1) && IS_8x8DCT(mb_type)
591 continue; 591 continue;
592 592
667 // and left mb is in available to us 667 // and left mb is in available to us
668 && h->left_type[0]) { 668 && h->left_type[0]) {
669 /* First vertical edge is different in MBAFF frames 669 /* First vertical edge is different in MBAFF frames
670 * There are 8 different bS to compute and 2 different Qp 670 * There are 8 different bS to compute and 2 different Qp
671 */ 671 */
672 DECLARE_ALIGNED_8(int16_t, bS)[8]; 672 DECLARE_ALIGNED(8, int16_t, bS)[8];
673 int qp[2]; 673 int qp[2];
674 int bqp[2]; 674 int bqp[2];
675 int rqp[2]; 675 int rqp[2];
676 int mb_qp, mbn0_qp, mbn1_qp; 676 int mb_qp, mbn0_qp, mbn1_qp;
677 int i; 677 int i;