virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

fixing qpel 4mv

Browse Source 
Originally committed as revision 945 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2002-09-14 12:36:54 +00:00
parent 85bf478ed9
commit 1e7bfebe7f
1 changed files with 60 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
libavcodec/mpegvideo.c
View File

@@ -1275,43 +1275,76 @@ static inline void MPV_motion(MpegEncContext *s,
} }
break; break;
case MV_TYPE_8X8: case MV_TYPE_8X8:
if(s->quarter_sample){ fprintf(stderr, "qpel4mv"); fflush(stderr);} mx = 0;
for(i=0;i<4;i++) { my = 0;
motion_x = s->mv[dir][i][0]; if(s->quarter_sample){
motion_y = s->mv[dir][i][1]; for(i=0;i<4;i++) {
motion_x = s->mv[dir][i][0];
motion_y = s->mv[dir][i][1];
dxy = ((motion_y & 1) << 1) | (motion_x & 1); dxy = ((motion_y & 3) << 2) | (motion_x & 3);
src_x = mb_x * 16 + (motion_x >> 1) + (i & 1) * 8; src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8;
src_y = mb_y * 16 + (motion_y >> 1) + (i >>1) * 8; src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8;
/* WARNING: do no forget half pels */ /* WARNING: do no forget half pels */
src_x = clip(src_x, -16, s->width); src_x = clip(src_x, -16, s->width);
if (src_x == s->width) if (src_x == s->width)
dxy &= ~1; dxy &= ~3;
src_y = clip(src_y, -16, s->height); src_y = clip(src_y, -16, s->height);
if (src_y == s->height) if (src_y == s->height)
dxy &= ~2; dxy &= ~12;
ptr = ref_picture[0] + (src_y * s->linesize) + (src_x); ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
if(s->flags&CODEC_FLAG_EMU_EDGE){ if(s->flags&CODEC_FLAG_EMU_EDGE){
if(src_x<0 || src_y<0 || src_x + (motion_x&1) + 8 > s->h_edge_pos if(src_x<0 || src_y<0 || src_x + (motion_x&3) + 8 > s->h_edge_pos
|| src_y + (motion_y&1) + 8 > s->v_edge_pos){ || src_y + (motion_y&3) + 8 > s->v_edge_pos){
emulated_edge_mc(s, ptr, s->linesize, 9, 9, src_x, src_y, s->h_edge_pos, s->v_edge_pos); emulated_edge_mc(s, ptr, s->linesize, 9, 9, src_x, src_y, s->h_edge_pos, s->v_edge_pos);
ptr= s->edge_emu_buffer; ptr= s->edge_emu_buffer;
}
} }
dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize;
qpix_op[1][dxy](dest, ptr, s->linesize);
mx += s->mv[dir][i][0]/2;
my += s->mv[dir][i][1]/2;
}
}else{
for(i=0;i<4;i++) {
motion_x = s->mv[dir][i][0];
motion_y = s->mv[dir][i][1];
dxy = ((motion_y & 1) << 1) | (motion_x & 1);
src_x = mb_x * 16 + (motion_x >> 1) + (i & 1) * 8;
src_y = mb_y * 16 + (motion_y >> 1) + (i >>1) * 8;
/* WARNING: do no forget half pels */
src_x = clip(src_x, -16, s->width);
if (src_x == s->width)
dxy &= ~1;
src_y = clip(src_y, -16, s->height);
if (src_y == s->height)
dxy &= ~2;
ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
if(s->flags&CODEC_FLAG_EMU_EDGE){
if(src_x<0 || src_y<0 || src_x + (motion_x&1) + 8 > s->h_edge_pos
|| src_y + (motion_y&1) + 8 > s->v_edge_pos){
emulated_edge_mc(s, ptr, s->linesize, 9, 9, src_x, src_y, s->h_edge_pos, s->v_edge_pos);
ptr= s->edge_emu_buffer;
}
}
dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize;
pix_op[1][dxy](dest, ptr, s->linesize, 8);
mx += s->mv[dir][i][0];
my += s->mv[dir][i][1];
} }
dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize;
pix_op[1][dxy](dest, ptr, s->linesize, 8);
} }
if(s->flags&CODEC_FLAG_GRAY) break; if(s->flags&CODEC_FLAG_GRAY) break;
/* In case of 8X8, we construct a single chroma motion vector /* In case of 8X8, we construct a single chroma motion vector
with a special rounding */ with a special rounding */
mx = 0;
my = 0;
for(i=0;i<4;i++) { for(i=0;i<4;i++) {
mx += s->mv[dir][i][0];
my += s->mv[dir][i][1];
} }
if (mx >= 0) if (mx >= 0)
mx = (h263_chroma_roundtab[mx & 0xf] + ((mx >> 3) & ~1)); mx = (h263_chroma_roundtab[mx & 0xf] + ((mx >> 3) & ~1));