generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "With on demand border extension, clamping the MV"

Browse Source 
This reverts commit b0fec6ab4a61ded1ab2ade188987631f53c4e9c1.

Change-Id: I9acd8ee0423f22d92138f11579611ff959331013
This commit is contained in:
Yaowu Xu 2014-03-12 19:36:48 -07:00
parent acf2eb73e7
commit 17256ad763
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vp9/common/vp9_reconinter.c
View File

@ -266,15 +266,21 @@ static void dec_build_inter_predictors(MACROBLOCKD *xd, int plane, int block,
? (plane == 0 ? mi->bmi[block].as_mv[ref].as_mv
: mi_mv_pred_q4(mi, ref))
: mi->mbmi.mv[ref].as_mv;
// TODO(jkoleszar): This clamping is done in the incorrect place for the
// scaling case. It needs to be done on the scaled MV, not the pre-scaling
// MV. Note however that it performs the subsampling aware scaling so
// that the result is always q4.
// mv_precision precision is MV_PRECISION_Q4.
const MV mv_q4 = clamp_mv_to_umv_border_sb(xd, &mv, bw, bh,
pd->subsampling_x,
pd->subsampling_y);
MV32 scaled_mv;
int xs, ys, x0, y0, x0_16, y0_16, frame_width, frame_height, buf_stride,
subpel_x, subpel_y;
uint8_t *ref_frame, *buf_ptr;
const YV12_BUFFER_CONFIG *ref_buf = xd->block_refs[ref]->buf;
const MV mv_q4 = {
mv.row * (1 << (1 - pd->subsampling_y)),
mv.col * (1 << (1 - pd->subsampling_x))
};
// Get reference frame pointer, width and height.
if (plane == 0) {