diff options
| author | Jingning Han <jingning@google.com> | 2014-09-11 16:16:26 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-09-11 16:16:26 -0700 |
| commit | 8e3f7a52a1b7d48eabcec4178bac4c84be3b6419 (patch) | |
| tree | 9feccf34ddfd677277323f8f33e8ec4e8516d96e /vp9 | |
| parent | 00fe92c22f875eee2f3bed9de542368ee00b2af2 (diff) | |
| download | libvpx-8e3f7a52a1b7d48eabcec4178bac4c84be3b6419.tar libvpx-8e3f7a52a1b7d48eabcec4178bac4c84be3b6419.tar.gz libvpx-8e3f7a52a1b7d48eabcec4178bac4c84be3b6419.tar.bz2 libvpx-8e3f7a52a1b7d48eabcec4178bac4c84be3b6419.zip | |
Remove unused best_inter_rd variable
The variable best_inter_rd is effectively not in use in the rate-
distortion mode search loops of both regular block sizes and sub8x8
block sizes.
Change-Id: I178f909f8c9629772e13adc6257908653b2adf31
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 03ea381f0..80d18ecf1 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2576,7 +2576,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, unsigned int ref_costs_single[MAX_REF_FRAMES], ref_costs_comp[MAX_REF_FRAMES]; vp9_prob comp_mode_p; int64_t best_intra_rd = INT64_MAX; - int64_t best_inter_rd = INT64_MAX; unsigned int best_pred_sse = UINT_MAX; PREDICTION_MODE best_intra_mode = DC_PRED; int rate_uv_intra[TX_SIZES], rate_uv_tokenonly[TX_SIZES]; @@ -2956,11 +2955,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, best_intra_rd = this_rd; best_intra_mode = mbmi->mode; } - } else { - // Keep record of best inter rd with single reference - if (!comp_pred && !mode_excluded && this_rd < best_inter_rd) { - best_inter_rd = this_rd; - } } if (!disable_skip && ref_frame == INTRA_FRAME) { @@ -3311,7 +3305,6 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, int ref_index, best_ref_index = 0; unsigned int ref_costs_single[MAX_REF_FRAMES], ref_costs_comp[MAX_REF_FRAMES]; vp9_prob comp_mode_p; - int64_t best_inter_rd = INT64_MAX; INTERP_FILTER tmp_best_filter = SWITCHABLE; int rate_uv_intra, rate_uv_tokenonly; int64_t dist_uv; @@ -3695,14 +3688,6 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2); } - // Keep record of best inter rd with single reference - if (is_inter_block(mbmi) && - !has_second_ref(mbmi) && - !mode_excluded && - this_rd < best_inter_rd) { - best_inter_rd = this_rd; - } - if (!disable_skip && ref_frame == INTRA_FRAME) { for (i = 0; i < REFERENCE_MODES; ++i) best_pred_rd[i] = MIN(best_pred_rd[i], this_rd); |