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

Merge "valgrind found motion vectors which exceeded frame boundaries"

Browse Source
This commit is contained in:
Jim Bankoski 2012-09-12 13:50:29 -07:00 committed by Gerrit Code Review
commit 08cf9faed0
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vp8/decoder/decodemv.c
View File

@ -293,26 +293,24 @@ static void decode_split_mv(vp8_reader *const bc, MODE_INFO *mi,
blockmv.as_mv.row += best_mv.as_mv.row; blockmv.as_mv.row += best_mv.as_mv.row;
blockmv.as_mv.col = read_mvcomponent(bc, &mvc[1]) << 1; blockmv.as_mv.col = read_mvcomponent(bc, &mvc[1]) << 1;
blockmv.as_mv.col += best_mv.as_mv.col; blockmv.as_mv.col += best_mv.as_mv.col;
mbmi->need_to_clamp_mvs |= vp8_check_mv_bounds(&blockmv,
mb_to_left_edge,
mb_to_right_edge,
mb_to_top_edge,
mb_to_bottom_edge);
} }
} }
else else
{ {
blockmv.as_int = abovemv.as_int; blockmv.as_int = abovemv.as_int;
mbmi->need_to_clamp_mvs |= above_mb->mbmi.need_to_clamp_mvs;
} }
} }
else else
{ {
blockmv.as_int = leftmv.as_int; blockmv.as_int = leftmv.as_int;
mbmi->need_to_clamp_mvs |= left_mb->mbmi.need_to_clamp_mvs;
} }
mbmi->need_to_clamp_mvs |= vp8_check_mv_bounds(&blockmv,
mb_to_left_edge,
mb_to_right_edge,
mb_to_top_edge,
mb_to_bottom_edge);
{ {
/* Fill (uniform) modes, mvs of jth subset. /* Fill (uniform) modes, mvs of jth subset.
Must do it here because ensuing subsets can Must do it here because ensuing subsets can