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

cygwin fix and dont average interlaced MVs patch by (Wolfgang Hesseler <qv at multimediaware dot com>) 

Originally committed as revision 2609 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Wolfgang Hesseler 2003-12-14 17:47:23 +00:00 committed by Michael Niedermayer
parent a4337a5130
commit fad05f523c
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
libavcodec/mpeg12.c
View File

@ -2164,44 +2164,48 @@ static int mpeg_decode_slice(AVCodecContext *avctx,
if(s->current_picture.motion_val[0]){ //note motion_val is normally NULL unless we want to extract the MVs
const int wrap = s->block_wrap[0];
const int xy = s->mb_x*2 + 1 + (s->mb_y*2 +1)*wrap;
int motion_for_x, motion_for_y, motion_back_x, motion_back_y;
int motion_for_top_x, motion_for_top_y, motion_back_top_x, motion_back_top_y;
int motion_for_bottom_x, motion_for_bottom_y, motion_back_bottom_x, motion_back_bottom_y;
if (s->mb_intra) {
motion_for_x = motion_for_y = motion_back_x = motion_back_y = 0;
motion_for_top_x = motion_for_top_y = motion_back_top_x = motion_back_top_y =
motion_for_bottom_x = motion_for_bottom_y = motion_back_bottom_x = motion_back_bottom_y = 0;
}else if (s->mv_type == MV_TYPE_16X16){
motion_for_x = s->mv[0][0][0];
motion_for_y = s->mv[0][0][1];
motion_back_x = s->mv[1][0][0];
motion_back_y = s->mv[1][0][1];
motion_for_top_x = motion_for_bottom_x = s->mv[0][0][0];
motion_for_top_y = motion_for_bottom_y = s->mv[0][0][1];
motion_back_top_x = motion_back_bottom_x = s->mv[1][0][0];
motion_back_top_y = motion_back_bottom_y = s->mv[1][0][1];
} else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ {
motion_for_x = s->mv[0][0][0] + s->mv[0][1][0];
motion_for_y = s->mv[0][0][1] + s->mv[0][1][1];
motion_for_x = (motion_for_x>>1) | (motion_for_x&1);
motion_back_x = s->mv[1][0][0] + s->mv[1][1][0];
motion_back_y = s->mv[1][0][1] + s->mv[1][1][1];
motion_back_x = (motion_back_x>>1) | (motion_back_x&1);
motion_for_top_x = s->mv[0][0][0];
motion_for_top_y = s->mv[0][0][1];
motion_for_bottom_x = s->mv[0][1][0];
motion_for_bottom_y = s->mv[0][1][1];
motion_back_top_x = s->mv[1][0][0];
motion_back_top_y = s->mv[1][0][1];
motion_back_bottom_x = s->mv[1][1][0];
motion_back_bottom_y = s->mv[1][1][1];
}
s->current_picture.motion_val[0][xy][0] = motion_for_x;
s->current_picture.motion_val[0][xy][1] = motion_for_y;
s->current_picture.motion_val[0][xy + 1][0] = motion_for_x;
s->current_picture.motion_val[0][xy + 1][1] = motion_for_y;
s->current_picture.motion_val[0][xy + wrap][0] = motion_for_x;
s->current_picture.motion_val[0][xy + wrap][1] = motion_for_y;
s->current_picture.motion_val[0][xy + 1 + wrap][0] = motion_for_x;
s->current_picture.motion_val[0][xy + 1 + wrap][1] = motion_for_y;
s->current_picture.motion_val[0][xy][0] = motion_for_top_x;
s->current_picture.motion_val[0][xy][1] = motion_for_top_y;
s->current_picture.motion_val[0][xy + 1][0] = motion_for_top_x;
s->current_picture.motion_val[0][xy + 1][1] = motion_for_top_y;
s->current_picture.motion_val[0][xy + wrap][0] = motion_for_bottom_x;
s->current_picture.motion_val[0][xy + wrap][1] = motion_for_bottom_y;
s->current_picture.motion_val[0][xy + 1 + wrap][0] = motion_for_bottom_x;
s->current_picture.motion_val[0][xy + 1 + wrap][1] = motion_for_bottom_y;
if(s->pict_type != B_TYPE){
motion_back_x = motion_back_y = 0;
motion_back_top_x = motion_back_top_y = motion_back_bottom_x = motion_back_bottom_y = 0;
}
s->current_picture.motion_val[1][xy][0] = motion_back_x;
s->current_picture.motion_val[1][xy][1] = motion_back_y;
s->current_picture.motion_val[1][xy + 1][0] = motion_back_x;
s->current_picture.motion_val[1][xy + 1][1] = motion_back_y;
s->current_picture.motion_val[1][xy + wrap][0] = motion_back_x;
s->current_picture.motion_val[1][xy + wrap][1] = motion_back_y;
s->current_picture.motion_val[1][xy + 1 + wrap][0] = motion_back_x;
s->current_picture.motion_val[1][xy + 1 + wrap][1] = motion_back_y;
s->current_picture.motion_val[1][xy][0] = motion_back_top_x;
s->current_picture.motion_val[1][xy][1] = motion_back_top_y;
s->current_picture.motion_val[1][xy + 1][0] = motion_back_top_x;
s->current_picture.motion_val[1][xy + 1][1] = motion_back_top_y;
s->current_picture.motion_val[1][xy + wrap][0] = motion_back_bottom_x;
s->current_picture.motion_val[1][xy + wrap][1] = motion_back_bottom_y;
s->current_picture.motion_val[1][xy + 1 + wrap][0] = motion_back_bottom_x;
s->current_picture.motion_val[1][xy + 1 + wrap][1] = motion_back_bottom_y;
}
s->dest[0] += 16;

2
libavformat/file.c
View File

@ -42,7 +42,7 @@ static int file_open(URLContext *h, const char *filename, int flags)
} else {
access = O_RDONLY;
}
#if defined(CONFIG_WIN32) || defined(CONFIG_OS2)
#if defined(CONFIG_WIN32) || defined(CONFIG_OS2) || defined(__CYGWIN__)
access |= O_BINARY;
#endif
fd = open(filename, access, 0666);