diff options
| author | Jingning Han <jingning@google.com> | 2014-09-13 10:43:14 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-09-13 10:43:14 -0700 |
| commit | ad3c92b9b7fb865cb3c29b1ab8d289b7dd03e096 (patch) | |
| tree | 4f7d9d1a4fa23f2e7234b8f0f7b6e0b65d306419 /vp9/encoder/vp9_rdopt.c | |
| parent | f02e0b6cf6c4f4cc75e71c1569c3907aa65af58f (diff) | |
| parent | 8e3f7a52a1b7d48eabcec4178bac4c84be3b6419 (diff) | |
| download | libvpx-ad3c92b9b7fb865cb3c29b1ab8d289b7dd03e096.tar libvpx-ad3c92b9b7fb865cb3c29b1ab8d289b7dd03e096.tar.gz libvpx-ad3c92b9b7fb865cb3c29b1ab8d289b7dd03e096.tar.bz2 libvpx-ad3c92b9b7fb865cb3c29b1ab8d289b7dd03e096.zip | |
Merge "Remove unused best_inter_rd variable"
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -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 6d5b7896f..35d62e87f 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); |