ref: ad3c92b9b7fb865cb3c29b1ab8d289b7dd03e096
parent: f02e0b6cf6c4f4cc75e71c1569c3907aa65af58f
parent: 8e3f7a52a1b7d48eabcec4178bac4c84be3b6419
author: Jingning Han <jingning@google.com>
date: Sat Sep 13 06:43:14 EDT 2014
Merge "Remove unused best_inter_rd variable"
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2576,7 +2576,6 @@
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 @@
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 @@
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;
@@ -3693,14 +3686,6 @@
// Calculate the final RD estimate for this mode.
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) {