diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-10-23 08:14:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-10-23 08:14:12 +0000 |
| commit | 4a3d7fbcbcd38ae9684ee4bda92f293070710740 (patch) | |
| tree | 18c687e1f138ab9c415a4b552db6582765940e91 /libavcodec/mpegvideo.c | |
| parent | 8d0e42cad06a5726146048359de46459df3fb675 (diff) | |
fixing interlaced MC & edge-emu
Originally committed as revision 1066 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 7fadcc2a0f..70bce2db20 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1283,8 +1283,9 @@ if(s->quarter_sample) if(s->flags&CODEC_FLAG_EMU_EDGE){ if(src_x<0 || src_y<0 || src_x + (motion_x&1) + 16 > s->h_edge_pos || src_y + (motion_y&1) + h > v_edge_pos){ - emulated_edge_mc(s, ptr, linesize, 17, h+1, src_x, src_y, s->h_edge_pos, v_edge_pos); - ptr= s->edge_emu_buffer; + emulated_edge_mc(s, ptr - src_offset, s->linesize, 17, 17+field_based, + src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); + ptr= s->edge_emu_buffer + src_offset; emu=1; } } @@ -1319,15 +1320,17 @@ if(s->quarter_sample) offset = (src_y * uvlinesize) + src_x + (src_offset >> 1); ptr = ref_picture[1] + offset; if(emu){ - emulated_edge_mc(s, ptr, uvlinesize, 9, (h>>1)+1, src_x, src_y, s->h_edge_pos>>1, v_edge_pos>>1); - ptr= s->edge_emu_buffer; + emulated_edge_mc(s, ptr - (src_offset >> 1), s->uvlinesize, 9, 9+field_based, + src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); + ptr= s->edge_emu_buffer + (src_offset >> 1); } pix_op[1][dxy](dest_cb + (dest_offset >> 1), ptr, uvlinesize, h >> 1); ptr = ref_picture[2] + offset; if(emu){ - emulated_edge_mc(s, ptr, uvlinesize, 9, (h>>1)+1, src_x, src_y, s->h_edge_pos>>1, v_edge_pos>>1); - ptr= s->edge_emu_buffer; + emulated_edge_mc(s, ptr - (src_offset >> 1), s->uvlinesize, 9, 9+field_based, + src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); + ptr= s->edge_emu_buffer + (src_offset >> 1); } pix_op[1][dxy](dest_cr + (dest_offset >> 1), ptr, uvlinesize, h >> 1); } @@ -1365,8 +1368,9 @@ static inline void qpel_motion(MpegEncContext *s, if(s->flags&CODEC_FLAG_EMU_EDGE){ if(src_x<0 || src_y<0 || src_x + (motion_x&3) + 16 > s->h_edge_pos || src_y + (motion_y&3) + h > v_edge_pos){ - emulated_edge_mc(s, ptr, linesize, 17, h+1, src_x, src_y, s->h_edge_pos, v_edge_pos); - ptr= s->edge_emu_buffer; + emulated_edge_mc(s, ptr - src_offset, s->linesize, 17, 17+field_based, + src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); + ptr= s->edge_emu_buffer + src_offset; emu=1; } } @@ -1409,15 +1413,17 @@ static inline void qpel_motion(MpegEncContext *s, offset = (src_y * uvlinesize) + src_x + (src_offset >> 1); ptr = ref_picture[1] + offset; if(emu){ - emulated_edge_mc(s, ptr, uvlinesize, 9, (h>>1)+1, src_x, src_y, s->h_edge_pos>>1, v_edge_pos>>1); - ptr= s->edge_emu_buffer; + emulated_edge_mc(s, ptr - (src_offset >> 1), s->uvlinesize, 9, 9 + field_based, + src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); + ptr= s->edge_emu_buffer + (src_offset >> 1); } pix_op[1][dxy](dest_cb + (dest_offset >> 1), ptr, uvlinesize, h >> 1); ptr = ref_picture[2] + offset; if(emu){ - emulated_edge_mc(s, ptr, uvlinesize, 9, (h>>1)+1, src_x, src_y, s->h_edge_pos>>1, v_edge_pos>>1); - ptr= s->edge_emu_buffer; + emulated_edge_mc(s, ptr - (src_offset >> 1), s->uvlinesize, 9, 9 + field_based, + src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); + ptr= s->edge_emu_buffer + (src_offset >> 1); } pix_op[1][dxy](dest_cr + (dest_offset >> 1), ptr, uvlinesize, h >> 1); } |