virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

simplify

Browse Source 
Originally committed as revision 3873 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-01-23 19:11:02 +00:00
parent 934982c4ac
commit 4ae33c9b52
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/h264.c
View File

@ -5532,24 +5532,17 @@ static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8
/* dir : 0 -> vertical edge, 1 -> horizontal edge */ /* dir : 0 -> vertical edge, 1 -> horizontal edge */
for( dir = 0; dir < 2; dir++ ) for( dir = 0; dir < 2; dir++ )
{ {
int start = 0;
int edge; int edge;
const int mbm_xy = dir == 0 ? mb_xy -1 : mb_xy - s->mb_stride;
int start = h->slice_table[mbm_xy] == 255 ? 1 : 0;
/* test picture boundary */ if (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_table[mb_xy])
if( ( dir == 0 && mb_x == 0 ) || ( dir == 1 && mb_y == 0 ) ) {
start = 1; start = 1;
}
if( 0 == start && 2 == h->deblocking_filter) {
const int mbn_xy = dir == 0 ? mb_xy -1 : mb_xy - s->mb_stride;
if (h->slice_table[mbn_xy] != h->slice_table[mb_xy]) {
start = 1;
}
}
/* Calculate bS */ /* Calculate bS */
for( edge = start; edge < 4; edge++ ) { for( edge = start; edge < 4; edge++ ) {
/* mbn_xy: neighbour macroblock (how that works for field ?) */ /* mbn_xy: neighbour macroblock (how that works for field ?) */
int mbn_xy = edge > 0 ? mb_xy : ( dir == 0 ? mb_xy -1 : mb_xy - s->mb_stride ); int mbn_xy = edge > 0 ? mb_xy : mbm_xy;
int bS[4]; int bS[4];
int qp; int qp;