diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-03-25 09:48:21 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-25 09:48:21 -0700 |
| commit | 59872069d249ddf1d6efdee124a3cfcfc8596cac (patch) | |
| tree | 78fa6341099f6cdc83c0518e9df004517db311ef /vp9/common | |
| parent | 17e9df144113eef80e76ce4fb66b0e3ddf23db82 (diff) | |
| parent | 22232ec6024a9ccb2ec3bebc7664a723e3e99566 (diff) | |
| download | libvpx-59872069d249ddf1d6efdee124a3cfcfc8596cac.tar libvpx-59872069d249ddf1d6efdee124a3cfcfc8596cac.tar.gz libvpx-59872069d249ddf1d6efdee124a3cfcfc8596cac.tar.bz2 libvpx-59872069d249ddf1d6efdee124a3cfcfc8596cac.zip | |
Merge "Change back the scaling calculation."
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_reconinter.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index 005f370a0..0a4c33962 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -308,10 +308,8 @@ static void dec_build_inter_predictors(MACROBLOCKD *xd, int plane, int block, y0_16 = sf->scale_value_y(y0_16, sf); // Map the top left corner of the block into the reference frame. - // NOTE: This must be done in this way instead of - // sf->scale_value_x(x_start + x, sf). - x0 = sf->scale_value_x(x_start, sf) + sf->scale_value_x(x, sf); - y0 = sf->scale_value_y(y_start, sf) + sf->scale_value_y(y, sf); + x0 = sf->scale_value_x(x_start + x, sf); + y0 = sf->scale_value_y(y_start + y, sf); // Scale the MV and incorporate the sub-pixel offset of the block // in the reference frame. |