libavcodec.hg: h264_loopfilter.c comparison

comparison h264_loopfilter.c @ 11203:10c06a9bd3d9 libavcodec

H264: use alias-safe macros This eliminates all aliasing violation warnings in h264 code. No measurable speed difference with gcc-4.4.3 on i7.

author	mru
date	Thu, 18 Feb 2010 16:24:31 +0000
parents	d464f498e19f
children	98970e51365a

comparison

equal deleted inserted replaced

-:778139a5e058
+:10c06a9bd3d9
 * @file libavcodec/h264_loopfilter.c
 * H.264 / AVC / MPEG4 part10 loop filter.
 * @author Michael Niedermayer <michaelni@gmx.at>
 */
+#include "libavutil/intreadwrite.h"
 #include "internal.h"
 #include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h264.h"
 filter_mb_edgech( &img_cr[2*0*uvlinesize], uvlinesize, bSH, qpc1, h);
 filter_mb_edgech( &img_cr[2*2*uvlinesize], uvlinesize, bS3, qpc, h);
 return;
 } else {
 LOCAL_ALIGNED_8(int16_t, bS, [2], [4][4]);
-uint64_t (*bSv)[4] = (uint64_t(*)[4])bS;
 int edges;
 if( IS_8x8DCT(mb_type) && (h->cbp&7) == 7 ) {
 edges = 4;
-bSv[0][0] = bSv[0][2] = bSv[1][0] = bSv[1][2] = 0x0002000200020002ULL;
+AV_WN64A(bS[0][0], 0x0002000200020002ULL);
+AV_WN64A(bS[0][2], 0x0002000200020002ULL);
+AV_WN64A(bS[1][0], 0x0002000200020002ULL);
+AV_WN64A(bS[1][2], 0x0002000200020002ULL);
 } else {
 int mask_edge1 = (3*(((5*mb_type)>>5)&1)) | (mb_type>>4); //(mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 : (mb_type & MB_TYPE_16x8) ? 1 : 0;
 int mask_edge0 = 3*((mask_edge1>>1) & ((5*left_type)>>5)&1); // (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) && (h->left_type[0] & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 : 0;
 int step =  1+(mb_type>>24); //IS_8x8DCT(mb_type) ? 2 : 1;
 edges = 4 - 3*((mb_type>>3) & !(h->cbp & 15)); //(mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache,
 h->list_count==2, edges, step, mask_edge0, mask_edge1, FIELD_PICTURE);
 }
 if( IS_INTRA(left_type) )
-bSv[0][0] = 0x0004000400040004ULL;
+AV_WN64A(bS[0][0], 0x0004000400040004ULL);
 if( IS_INTRA(h->top_type) )
-bSv[1][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL;
+AV_WN64A(bS[1][0], FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL);
 #define FILTER(hv,dir,edge)\
-if(bSv[dir][edge]) {\
+if(AV_RN64A(bS[dir][edge])) {                                   \
 filter_mb_edge##hv( &img_y[4*edge*(dir?linesize:1)], linesize, bS[dir][edge], edge ? qp : qp##dir, h );\
 if(!(edge&1)) {\
 filter_mb_edgec##hv( &img_cb[2*edge*(dir?uvlinesize:1)], uvlinesize, bS[dir][edge], edge ? qpc : qpc##dir, h );\
 filter_mb_edgec##hv( &img_cr[2*edge*(dir?uvlinesize:1)], uvlinesize, bS[dir][edge], edge ? qpc : qpc##dir, h );\
 }\
 for(j=0; j<2; j++, mbn_xy += s->mb_stride){
 DECLARE_ALIGNED_8(int16_t, bS)[4];
 int qp;
 if( IS_INTRA(mb_type|s->current_picture.mb_type[mbn_xy]) ) {
-*(uint64_t*)bS= 0x0003000300030003ULL;
+AV_WN64A(bS, 0x0003000300030003ULL);
 } else {
 if(!CABAC && IS_8x8DCT(s->current_picture.mb_type[mbn_xy])){
 bS[0]= 1+((h->cbp_table[mbn_xy] & 4)||h->non_zero_count_cache[scan8[0]+0]);
 bS[1]= 1+((h->cbp_table[mbn_xy] & 4)||h->non_zero_count_cache[scan8[0]+1]);
 bS[2]= 1+((h->cbp_table[mbn_xy] & 8)||h->non_zero_count_cache[scan8[0]+2]);
 }else{
 DECLARE_ALIGNED_8(int16_t, bS)[4];
 int qp;
 if( IS_INTRA(mb_type|mbm_type)) {
-*(uint64_t*)bS= 0x0003000300030003ULL;
+AV_WN64A(bS, 0x0003000300030003ULL);
 if (   (!IS_INTERLACED(mb_type|mbm_type))
 || ((FRAME_MBAFF || (s->picture_structure != PICT_FRAME)) && (dir == 0))
 )
-*(uint64_t*)bS= 0x0004000400040004ULL;
+AV_WN64A(bS, 0x0004000400040004ULL);
 } else {
 int i;
 int mv_done;
 if( dir && FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbm_type)) {
-*(uint64_t*)bS= 0x0001000100010001ULL;
+AV_WN64A(bS, 0x0001000100010001ULL);
 mv_done = 1;
 }
 else if( mask_par0 && ((mbm_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)))) ) {
 int b_idx= 8 + 4;
 int bn_idx= b_idx - (dir ? 8:1);
 if( IS_8x8DCT(mb_type & (edge<<24)) ) // (edge&1) && IS_8x8DCT(mb_type)
 continue;
 if( IS_INTRA(mb_type)) {
-*(uint64_t*)bS= 0x0003000300030003ULL;
+AV_WN64A(bS, 0x0003000300030003ULL);
 } else {
 int i;
 int mv_done;
 if( edge & mask_edge ) {
-*(uint64_t*)bS= 0;
+AV_ZERO64(bS);
 mv_done = 1;
 }
 else if( mask_par0 ) {
 int b_idx= 8 + 4 + edge * (dir ? 8:1);
 int bn_idx= b_idx - (dir ? 8:1);
 int rqp[2];
 int mb_qp, mbn0_qp, mbn1_qp;
 int i;
 first_vertical_edge_done = 1;
-if( IS_INTRA(mb_type) )
+if( IS_INTRA(mb_type) ) {
-*(uint64_t*)&bS[0]=
+AV_WN64A(&bS[0], 0x0004000400040004ULL);
-*(uint64_t*)&bS[4]= 0x0004000400040004ULL;
+AV_WN64A(&bS[4], 0x0004000400040004ULL);
-else {
+} else {
 static const uint8_t offset[2][2][8]={
 {
 {7+8*0, 7+8*0, 7+8*0, 7+8*0, 7+8*1, 7+8*1, 7+8*1, 7+8*1},
 {7+8*2, 7+8*2, 7+8*2, 7+8*2, 7+8*3, 7+8*3, 7+8*3, 7+8*3},
 },{

Mercurial > libavcodec.hg

comparison h264_loopfilter.c @ 11203:10c06a9bd3d9 libavcodec