diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-06-17 10:31:58 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-06-17 10:31:58 -0700 |
| commit | 61ecc282b562120fc104b56115d41582903da07e (patch) | |
| tree | 406d5c5bd6b8a82ee12287fda0281c694d7d640b | |
| parent | 7e934408062703549ed4248a17d32963221a8d5c (diff) | |
| parent | 8e47093c9ecc191d00fc025db9cc8fd2fb24c073 (diff) | |
| download | libvpx-61ecc282b562120fc104b56115d41582903da07e.tar libvpx-61ecc282b562120fc104b56115d41582903da07e.tar.gz libvpx-61ecc282b562120fc104b56115d41582903da07e.tar.bz2 libvpx-61ecc282b562120fc104b56115d41582903da07e.zip | |
Merge "Remove unused need_to_clamp_mvs"
| -rw-r--r-- | vp9/common/vp9_blockd.h | 2 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 98b19e8ae..37d29af17 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -217,8 +217,6 @@ typedef struct { int mb_mode_context[MAX_REF_FRAMES]; unsigned char mb_skip_coeff; /* does this mb has coefficients at all, 1=no coefficients, 0=need decode tokens */ - unsigned char need_to_clamp_mvs; - unsigned char need_to_clamp_secondmv; unsigned char segment_id; // Segment id for current frame // Flags used for prediction status of various bistream signals diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 7a8fb0e58..375fe2a4d 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -501,8 +501,6 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, int mb_to_left_edge, mb_to_right_edge, mb_to_top_edge, mb_to_bottom_edge; int j, idx, idy; - mbmi->need_to_clamp_mvs = 0; - mbmi->need_to_clamp_secondmv = 0; mbmi->ref_frame[1] = NONE; // Make sure the MACROBLOCKD mode info pointer is pointed at the @@ -624,7 +622,6 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, mbmi->uv_mode = DC_PRED; if (mbmi->sb_type < BLOCK_SIZE_SB8X8) { - mbmi->need_to_clamp_mvs = 0; for (idy = 0; idy < 2; idy += bh) { for (idx = 0; idx < 2; idx += bw) { int_mv blockmv, secondmv; @@ -735,21 +732,9 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, case NEWMV: decode_mv(r, &mv0->as_mv, &best_mv.as_mv, nmvc, &cm->fc.NMVcount, xd->allow_high_precision_mv); - mbmi->need_to_clamp_mvs = check_mv_bounds(mv0, - mb_to_left_edge, - mb_to_right_edge, - mb_to_top_edge, - mb_to_bottom_edge); - - if (mbmi->ref_frame[1] > 0) { + if (mbmi->ref_frame[1] > 0) decode_mv(r, &mv1->as_mv, &best_mv_second.as_mv, nmvc, &cm->fc.NMVcount, xd->allow_high_precision_mv); - mbmi->need_to_clamp_secondmv = check_mv_bounds(mv1, - mb_to_left_edge, - mb_to_right_edge, - mb_to_top_edge, - mb_to_bottom_edge); - } break; default: #if CONFIG_DEBUG |