diff options
| author | hkuang <hkuang@google.com> | 2015-07-01 16:22:47 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-07-03 11:05:28 -0700 |
| commit | 52e358f13edf5e792ba68d4f19e840c52ab554a3 (patch) | |
| tree | 404e85b6a2e24baa0a63e280cdf71bbb1b52beea /vp9 | |
| parent | 79fcc567813f8d435906068246bae7fd44f0f8b3 (diff) | |
| download | libvpx-52e358f13edf5e792ba68d4f19e840c52ab554a3.tar libvpx-52e358f13edf5e792ba68d4f19e840c52ab554a3.tar.gz libvpx-52e358f13edf5e792ba68d4f19e840c52ab554a3.tar.bz2 libvpx-52e358f13edf5e792ba68d4f19e840c52ab554a3.zip | |
Revert "Correct the inter prediction coordinate..."
Change in 92b199061a13173d29247257f4ef906d38b012bf leads to frame parallel
decode failure in extreme case.
addresses issue #1010
Change-Id: I4fa488dac8e8c584f5eef4cae1640a579130d387
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 659b84848..4fc10b4e7 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -575,10 +575,10 @@ static void dec_build_inter_predictors(VP9Decoder *const pbi, MACROBLOCKD *xd, // width/height is not a multiple of 8 pixels. if (is_scaled || scaled_mv.col || scaled_mv.row || (frame_width & 0x7) || (frame_height & 0x7)) { - int y1 = (y0_16 + (h - 1) * ys) >> SUBPEL_BITS; + int y1 = ((y0_16 + (h - 1) * ys) >> SUBPEL_BITS) + 1; // Get reference block bottom right horizontal coordinate. - int x1 = (x0_16 + (w - 1) * xs) >> SUBPEL_BITS; + int x1 = ((x0_16 + (w - 1) * xs) >> SUBPEL_BITS) + 1; int x_pad = 0, y_pad = 0; if (subpel_x || (sf->x_step_q4 != SUBPEL_SHIFTS)) { |