RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

get rid of the start variable. 

a few cycles faster

Originally committed as revision 21494 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-01-28 01:31:06 +00:00
parent 980bcc554d
commit b304767301
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/h264_loopfilter.c
View File

@ -431,12 +431,12 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
// how often to recheck mv-based bS when iterating along each edge // how often to recheck mv-based bS when iterating along each edge
const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)); const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir));
int start = h->slice_table[mbm_xy] == 0xFFFF
if(!(h->slice_table[mbm_xy] == 0xFFFF
|| first_vertical_edge_done || first_vertical_edge_done
|| (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_num); || (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_num))){
if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0)
if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0) && start == 0
&& IS_INTERLACED(mbm_type&~mb_type) && IS_INTERLACED(mbm_type&~mb_type)
) { ) {
// This is a special case in the norm where the filtering must // This is a special case in the norm where the filtering must
@ -471,12 +471,7 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
filter_mb_edgech( &img_cr[j*uvlinesize], tmp_uvlinesize, bS, filter_mb_edgech( &img_cr[j*uvlinesize], tmp_uvlinesize, bS,
( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1, h); ( h->chroma_qp[1] + get_chroma_qp( h, 1, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1, h);
} }
}else{
start = 1;
}
/* Calculate bS */
if(start==0) {
DECLARE_ALIGNED_8(int16_t, bS)[4]; DECLARE_ALIGNED_8(int16_t, bS)[4];
int qp; int qp;
@ -588,6 +583,8 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
} }
} }
} }
}
/* Calculate bS */ /* Calculate bS */
for( edge = 1; edge < edges; edge++ ) { for( edge = 1; edge < edges; edge++ ) {
DECLARE_ALIGNED_8(int16_t, bS)[4]; DECLARE_ALIGNED_8(int16_t, bS)[4];