summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2014-09-24 10:46:52 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-09-25 08:24:16 -0700
commit845d4f333d4492cf99006192a9844a6d2a4eb4fc (patch)
tree9db90b9ceb6111b8679d9cbf1a9acef18d8da469 /vp9
parent6989e81d611b438c21cab5576d01b1b30c5b1e34 (diff)
downloadlibvpx-845d4f333d4492cf99006192a9844a6d2a4eb4fc.tar
libvpx-845d4f333d4492cf99006192a9844a6d2a4eb4fc.tar.gz
libvpx-845d4f333d4492cf99006192a9844a6d2a4eb4fc.tar.bz2
libvpx-845d4f333d4492cf99006192a9844a6d2a4eb4fc.zip
Fix a couple of comments
The first comment is obselete given the way is now normative in VP9 bitstream. The second comment line was too long. Change-Id: I6546585babf60d466485ddcf2daa6d2fa79e999a
Diffstat (limited to 'vp9')
-rw-r--r--vp9/common/vp9_reconinter.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c
index e30990460..513630bc0 100644
--- a/vp9/common/vp9_reconinter.c
+++ b/vp9/common/vp9_reconinter.c
@@ -385,12 +385,6 @@ static void dec_build_inter_predictors(MACROBLOCKD *xd, int plane, int block,
? average_split_mvs(pd, mi, ref, block)
: 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);
@@ -451,7 +445,8 @@ static void dec_build_inter_predictors(MACROBLOCKD *xd, int plane, int block,
subpel_x = scaled_mv.col & SUBPEL_MASK;
subpel_y = scaled_mv.row & SUBPEL_MASK;
- // Calculate the top left corner of the best matching block in the reference frame.
+ // Calculate the top left corner of the best matching block in the
+ // reference frame.
x0 += scaled_mv.col >> SUBPEL_BITS;
y0 += scaled_mv.row >> SUBPEL_BITS;
x0_16 += scaled_mv.col;