diff options
| author | Jingning Han <jingning@google.com> | 2014-07-23 12:02:52 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-07-23 12:04:45 -0700 |
| commit | e945c56d4a47da69eb19505fef41861dab393b60 (patch) | |
| tree | b603ddbdf3ad88a264c5591b1a23b0ffd0aa0ff5 /vp9/encoder/vp9_rdopt.c | |
| parent | 4f2f86725b3e56b28762318f3f810edcd6d619ef (diff) | |
| download | libvpx-e945c56d4a47da69eb19505fef41861dab393b60.tar libvpx-e945c56d4a47da69eb19505fef41861dab393b60.tar.gz libvpx-e945c56d4a47da69eb19505fef41861dab393b60.tar.bz2 libvpx-e945c56d4a47da69eb19505fef41861dab393b60.zip | |
Remove redundant argument entry in handle_inter_mode
The value of mode_excluded has been properly set in
vp9_rd_pick_inter_mode_sb(). It is redundant to send it in
handle_inter_mode() and re-set the value again.
Change-Id: I408d4731f2f42e0bcf3ae62e85757717bb410471
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index e5d0e6a44..c65af75ee 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2013,7 +2013,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, int *skippable, int *rate_y, int64_t *distortion_y, int *rate_uv, int64_t *distortion_uv, - int *mode_excluded, int *disable_skip, + int *disable_skip, int_mv (*mode_mv)[MAX_REF_FRAMES], int mi_row, int mi_col, int_mv single_newmv[MAX_REF_FRAMES], @@ -2121,10 +2121,6 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, * if the first is known */ *rate2 += cost_mv_ref(cpi, this_mode, mbmi->mode_context[refs[0]]); - if (!(*mode_excluded)) - *mode_excluded = is_comp_pred ? cm->reference_mode == SINGLE_REFERENCE - : cm->reference_mode == COMPOUND_REFERENCE; - pred_exists = 0; // Are all MVs integer pel for Y and UV intpel_mv = !mv_has_subpel(&mbmi->mv[0].as_mv); @@ -2755,7 +2751,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, &rate2, &distortion2, &skippable, &rate_y, &distortion_y, &rate_uv, &distortion_uv, - &mode_excluded, &disable_skip, frame_mv, + &disable_skip, frame_mv, mi_row, mi_col, single_newmv, &total_sse, best_rd); if (this_rd == INT64_MAX) |