|
|
|
@@ -384,13 +384,13 @@ static int qpel_motion_search(MpegEncContext * s, |
|
|
|
|
|
|
|
#define CHECK_MV_DIR(x,y,new_dir)\ |
|
|
|
{\ |
|
|
|
const unsigned key = ((y)<<ME_MAP_MV_BITS) + (x) + map_generation;\ |
|
|
|
const int index= (((y)<<ME_MAP_SHIFT) + (x))&(ME_MAP_SIZE-1);\ |
|
|
|
const unsigned key = ((unsigned)(y)<<ME_MAP_MV_BITS) + (x) + map_generation;\ |
|
|
|
const int index= (((unsigned)(y)<<ME_MAP_SHIFT) + (x))&(ME_MAP_SIZE-1);\ |
|
|
|
if(map[index]!=key){\ |
|
|
|
d= cmp(s, x, y, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);\ |
|
|
|
map[index]= key;\ |
|
|
|
score_map[index]= d;\ |
|
|
|
d += (mv_penalty[((x)<<shift)-pred_x] + mv_penalty[((y)<<shift)-pred_y])*penalty_factor;\ |
|
|
|
d += (mv_penalty[(int)((unsigned)(x)<<shift)-pred_x] + mv_penalty[(int)((unsigned)(y)<<shift)-pred_y])*penalty_factor;\ |
|
|
|
if(d<dmin){\ |
|
|
|
best[0]=x;\ |
|
|
|
best[1]=y;\ |
|
|
|
|