diff options
author | Jingning Han <jingning@google.com> | 2014-09-13 10:43:03 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-09-13 10:43:03 -0700 |
commit | f02e0b6cf6c4f4cc75e71c1569c3907aa65af58f (patch) | |
tree | 2ba25b031d73bb1d647e10a1b514390d88e0b588 | |
parent | 82fad6f4b6068066d38bc59390b27aa0aacc1a2e (diff) | |
parent | 00fe92c22f875eee2f3bed9de542368ee00b2af2 (diff) | |
download | libvpx-f02e0b6cf6c4f4cc75e71c1569c3907aa65af58f.tar libvpx-f02e0b6cf6c4f4cc75e71c1569c3907aa65af58f.tar.gz libvpx-f02e0b6cf6c4f4cc75e71c1569c3907aa65af58f.tar.bz2 libvpx-f02e0b6cf6c4f4cc75e71c1569c3907aa65af58f.zip |
Merge "Remove unused speed feature"
-rw-r--r-- | vp9/encoder/vp9_rdopt.c | 12 | ||||
-rw-r--r-- | vp9/encoder/vp9_speed_features.c | 3 | ||||
-rw-r--r-- | vp9/encoder/vp9_speed_features.h | 5 |
3 files changed, 1 insertions, 19 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 9df85defd..6d5b7896f 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2579,7 +2579,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, int64_t best_inter_rd = INT64_MAX; unsigned int best_pred_sse = UINT_MAX; PREDICTION_MODE best_intra_mode = DC_PRED; - MV_REFERENCE_FRAME best_inter_ref_frame = LAST_FRAME; int rate_uv_intra[TX_SIZES], rate_uv_tokenonly[TX_SIZES]; int64_t dist_uv[TX_SIZES]; int skip_uv[TX_SIZES]; @@ -2799,10 +2798,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, best_mode_index >=0 && best_mbmode.ref_frame[0] == INTRA_FRAME) continue; - if ((mode_search_skip_flags & FLAG_SKIP_COMP_REFMISMATCH) && - ref_frame != best_inter_ref_frame && - second_ref_frame != best_inter_ref_frame) - continue; mode_excluded = cm->reference_mode == SINGLE_REFERENCE; } else { if (ref_frame != INTRA_FRAME) @@ -2965,7 +2960,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, // Keep record of best inter rd with single reference if (!comp_pred && !mode_excluded && this_rd < best_inter_rd) { best_inter_rd = this_rd; - best_inter_ref_frame = ref_frame; } } @@ -3318,7 +3312,6 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(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_inter_rd = INT64_MAX; - MV_REFERENCE_FRAME best_inter_ref_frame = LAST_FRAME; INTERP_FILTER tmp_best_filter = SWITCHABLE; int rate_uv_intra, rate_uv_tokenonly; int64_t dist_uv; @@ -3430,10 +3423,6 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, if ((cpi->sf.mode_search_skip_flags & FLAG_SKIP_COMP_BESTINTRA) && vp9_ref_order[best_ref_index].ref_frame[0] == INTRA_FRAME) continue; - if ((cpi->sf.mode_search_skip_flags & FLAG_SKIP_COMP_REFMISMATCH) && - ref_frame != best_inter_ref_frame && - second_ref_frame != best_inter_ref_frame) - continue; } // TODO(jingning, jkoleszar): scaling reference frame not supported for @@ -3712,7 +3701,6 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, !mode_excluded && this_rd < best_inter_rd) { best_inter_rd = this_rd; - best_inter_ref_frame = ref_frame; } if (!disable_skip && ref_frame == INTRA_FRAME) { diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index 889a8be21..7ddeac73d 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -126,8 +126,7 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm, sf->mv.search_method = BIGDIA; sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED; sf->adaptive_rd_thresh = 4; - sf->mode_search_skip_flags |= FLAG_SKIP_COMP_REFMISMATCH | - FLAG_EARLY_TERMINATE; + sf->mode_search_skip_flags |= FLAG_EARLY_TERMINATE; sf->disable_filter_search_var_thresh = 200; sf->use_lp32x32fdct = 1; sf->use_fast_coef_updates = ONE_LOOP_REDUCED; diff --git a/vp9/encoder/vp9_speed_features.h b/vp9/encoder/vp9_speed_features.h index 0f49154ff..a56d7de3a 100644 --- a/vp9/encoder/vp9_speed_features.h +++ b/vp9/encoder/vp9_speed_features.h @@ -125,11 +125,6 @@ typedef enum { // Skips comp inter modes if the best so far is an intra mode. FLAG_SKIP_COMP_BESTINTRA = 1 << 1, - // Skips comp inter modes if the best single intermode so far does - // not have the same reference as one of the two references being - // tested. - FLAG_SKIP_COMP_REFMISMATCH = 1 << 2, - // Skips oblique intra modes if the best so far is an inter mode. FLAG_SKIP_INTRA_BESTINTER = 1 << 3, |