Commit 59872069 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "Change back the scaling calculation."

parents 17e9df14 22232ec6
......@@ -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.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment