generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpegvideo: simplify dxy calculation in hpel_motion()

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2012-08-04 02:57:53 +01:00
parent c262649291
commit 5e39bb073a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mpegvideo_motion.c
View File

@ -177,20 +177,19 @@ static inline int hpel_motion(MpegEncContext *s,
op_pixels_func *pix_op,
int motion_x, int motion_y)
{
int dxy;
int dxy = 0;
int emu=0;
dxy = ((motion_y & 1) << 1) | (motion_x & 1);
src_x += motion_x >> 1;
src_y += motion_y >> 1;
/* WARNING: do no forget half pels */
src_x = av_clip(src_x, -16, s->width); //FIXME unneeded for emu?
if (src_x == s->width)
dxy &= ~1;
if (src_x != s->width)
dxy |= motion_x & 1;
src_y = av_clip(src_y, -16, s->height);
if (src_y == s->height)
dxy &= ~2;
if (src_y != s->height)
dxy |= (motion_y & 1) << 1;
src += src_y * s->linesize + src_x;
if(s->unrestricted_mv && (s->flags&CODEC_FLAG_EMU_EDGE)){