diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-04-05 12:50:19 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-04-05 12:50:19 -0700 |
| commit | 36c3a67c201703f02736173fc5780b867b17e56b (patch) | |
| tree | 1ac28d31d8e8f6135cdcc830ae676501df9299ed /vp9/common/vp9_reconinter.c | |
| parent | 61834f732579bc0ed470ba45e504c60d92c75170 (diff) | |
| download | libvpx-36c3a67c201703f02736173fc5780b867b17e56b.tar libvpx-36c3a67c201703f02736173fc5780b867b17e56b.tar.gz libvpx-36c3a67c201703f02736173fc5780b867b17e56b.tar.bz2 libvpx-36c3a67c201703f02736173fc5780b867b17e56b.zip | |
Remove full-pixel-related code.
This is a VP8-only feature (part of profile 3) that is unsupported in
VP9.
Change-Id: I78016eede8d9c834d44d4c517f3e8b8fc2a378b1
Diffstat (limited to 'vp9/common/vp9_reconinter.c')
| -rw-r--r-- | vp9/common/vp9_reconinter.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index 75b4e7cae..19c2e968a 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -974,9 +974,6 @@ static void build_inter16x16_predictors_mbuv_w(MACROBLOCKD *xd, _16x16mv.as_mv.row /= 2; _16x16mv.as_mv.col /= 2; - _16x16mv.as_mv.row &= xd->fullpixel_mask; - _16x16mv.as_mv.col &= xd->fullpixel_mask; - uptr = (which_mv ? xd->second_pre.u_buffer : xd->pre.u_buffer); vptr = (which_mv ? xd->second_pre.v_buffer : xd->pre.v_buffer); @@ -1051,9 +1048,6 @@ void vp9_build_inter16x16_predictors_mbuv(MACROBLOCKD *xd, _16x16mv.as_mv.row /= 2; _16x16mv.as_mv.col /= 2; - _16x16mv.as_mv.row &= xd->fullpixel_mask; - _16x16mv.as_mv.col &= xd->fullpixel_mask; - uptr = (which_mv ? xd->second_pre.u_buffer : xd->pre.u_buffer); vptr = (which_mv ? xd->second_pre.v_buffer : xd->pre.v_buffer); @@ -1617,7 +1611,7 @@ static int mi_mv_pred_row(MACROBLOCKD *mb, int off, int idx) { mb->mode_info_context->bmi[off + 1].as_mv[idx].as_mv.row + mb->mode_info_context->bmi[off + 4].as_mv[idx].as_mv.row + mb->mode_info_context->bmi[off + 5].as_mv[idx].as_mv.row; - return round_mv_comp(temp) & mb->fullpixel_mask; + return round_mv_comp(temp); } static int mi_mv_pred_col(MACROBLOCKD *mb, int off, int idx) { @@ -1625,7 +1619,7 @@ static int mi_mv_pred_col(MACROBLOCKD *mb, int off, int idx) { mb->mode_info_context->bmi[off + 1].as_mv[idx].as_mv.col + mb->mode_info_context->bmi[off + 4].as_mv[idx].as_mv.col + mb->mode_info_context->bmi[off + 5].as_mv[idx].as_mv.col; - return round_mv_comp(temp) & mb->fullpixel_mask; + return round_mv_comp(temp); } static int b_mv_pred_row(MACROBLOCKD *mb, int off, int idx) { @@ -1634,7 +1628,7 @@ static int b_mv_pred_row(MACROBLOCKD *mb, int off, int idx) { blockd[off + 1].bmi.as_mv[idx].as_mv.row + blockd[off + 4].bmi.as_mv[idx].as_mv.row + blockd[off + 5].bmi.as_mv[idx].as_mv.row; - return round_mv_comp(temp) & mb->fullpixel_mask; + return round_mv_comp(temp); } static int b_mv_pred_col(MACROBLOCKD *mb, int off, int idx) { @@ -1643,7 +1637,7 @@ static int b_mv_pred_col(MACROBLOCKD *mb, int off, int idx) { blockd[off + 1].bmi.as_mv[idx].as_mv.col + blockd[off + 4].bmi.as_mv[idx].as_mv.col + blockd[off + 5].bmi.as_mv[idx].as_mv.col; - return round_mv_comp(temp) & mb->fullpixel_mask; + return round_mv_comp(temp); } |