ref: 59872069d249ddf1d6efdee124a3cfcfc8596cac
parent: 17e9df144113eef80e76ce4fb66b0e3ddf23db82
parent: 22232ec6024a9ccb2ec3bebc7664a723e3e99566
author: Yaowu Xu <yaowu@google.com>
date: Tue Mar 25 05:48:21 EDT 2014
Merge "Change back the scaling calculation."
--- a/vp9/common/vp9_reconinter.c
+++ b/vp9/common/vp9_reconinter.c
@@ -308,10 +308,8 @@
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.
--
⑨