diff options
| author | Daniel Kang <ddkang@google.com> | 2012-08-16 11:04:34 -0700 |
|---|---|---|
| committer | Daniel Kang <ddkang@google.com> | 2012-08-16 11:04:34 -0700 |
| commit | e5cc24cc2e097ab569fca493e490a8e059993d26 (patch) | |
| tree | 69fe269ca13da5b674f8e4b5cde9ad7f044f79ac /vp8/common | |
| parent | 0393e558a4710b31836ead8f9832f6b270daf57c (diff) | |
| download | libvpx-e5cc24cc2e097ab569fca493e490a8e059993d26.tar libvpx-e5cc24cc2e097ab569fca493e490a8e059993d26.tar.gz libvpx-e5cc24cc2e097ab569fca493e490a8e059993d26.tar.bz2 libvpx-e5cc24cc2e097ab569fca493e490a8e059993d26.zip | |
Fix valgrind error which causes non-deterministic results.
Error was introduced in bf474e170fefbed60cf20fa3d2e9e229776469f0
Change-Id: I55bf114a1938c3a8869d8ff49cbe076eb9e83ea0
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/reconinter.c | 8 | ||||
| -rw-r--r-- | vp8/common/reconinter.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/vp8/common/reconinter.c b/vp8/common/reconinter.c index 0d82db784..d73d8fd1c 100644 --- a/vp8/common/reconinter.c +++ b/vp8/common/reconinter.c @@ -619,7 +619,8 @@ static void clamp_uvmv_to_umv_border(MV *mv, const MACROBLOCKD *xd) { /*encoder only*/ void vp8_build_1st_inter16x16_predictors_mby(MACROBLOCKD *xd, unsigned char *dst_y, - int dst_ystride) { + int dst_ystride, + int clamp_mvs) { unsigned char *ptr_base = xd->pre.y_buffer; unsigned char *ptr; int pre_stride = xd->block[0].pre_stride; @@ -627,7 +628,7 @@ void vp8_build_1st_inter16x16_predictors_mby(MACROBLOCKD *xd, ymv.as_int = xd->mode_info_context->mbmi.mv[0].as_int; - if (xd->mode_info_context->mbmi.need_to_clamp_mvs) + if (clamp_mvs) clamp_mv_to_umv_border(&ymv.as_mv, xd); ptr = ptr_base + (ymv.as_mv.row >> 3) * pre_stride + (ymv.as_mv.col >> 3); @@ -755,7 +756,8 @@ void vp8_build_1st_inter16x16_predictors_mb(MACROBLOCKD *xd, unsigned char *dst_u, unsigned char *dst_v, int dst_ystride, int dst_uvstride) { - vp8_build_1st_inter16x16_predictors_mby(xd, dst_y, dst_ystride); + vp8_build_1st_inter16x16_predictors_mby(xd, dst_y, dst_ystride, + xd->mode_info_context->mbmi.need_to_clamp_mvs); vp8_build_1st_inter16x16_predictors_mbuv(xd, dst_u, dst_v, dst_uvstride); } diff --git a/vp8/common/reconinter.h b/vp8/common/reconinter.h index 48d95fff2..7ad0adbd4 100644 --- a/vp8/common/reconinter.h +++ b/vp8/common/reconinter.h @@ -18,7 +18,8 @@ extern void vp8_build_1st_inter16x16_predictors_mby(MACROBLOCKD *xd, unsigned char *dst_y, - int dst_ystride); + int dst_ystride, + int clamp_mvs); extern void vp8_build_1st_inter16x16_predictors_mbuv(MACROBLOCKD *xd, unsigned char *dst_u, unsigned char *dst_v, |