Bug 696390 - Fix libvpx splitmv clamping, r=cpearce

This commit is contained in:
John Koleszar 2011-11-02 15:31:10 -07:00
parent ec64b8b07b
commit 61526dcca1
3 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,22 @@
diff --git a/media/libvpx/vp8/decoder/decodemv.c b/media/libvpx/vp8/decoder/decodemv.c
--- a/media/libvpx/vp8/decoder/decodemv.c
+++ b/media/libvpx/vp8/decoder/decodemv.c
@@ -361,17 +361,17 @@ static void read_mb_modes_mv(VP8D_COMP *
#ifdef VPX_MODE_COUNT
vp8_mv_cont_count[mv_contz][2]++;
#endif
break;
default:
break;
}
- mbmi->need_to_clamp_mvs = vp8_check_mv_bounds(&blockmv,
+ 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.
Must do it here because ensuing subsets can

View File

@ -438,3 +438,6 @@ patch -p3 < solaris.patch
# Patch to fix errors including C headers in C++
patch -p3 < compile_errors.patch
# Patch to fix MV clamping in the v0.9.7-p1 release.
patch -p3 < bug696390.patch

View File

@ -366,7 +366,7 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
break;
}
mbmi->need_to_clamp_mvs = vp8_check_mv_bounds(&blockmv,
mbmi->need_to_clamp_mvs |= vp8_check_mv_bounds(&blockmv,
mb_to_left_edge,
mb_to_right_edge,
mb_to_top_edge,