From 74ddde01c07967276e67d5e3ca1bef506dfc30f7 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Thu, 11 Sep 2014 17:15:15 -0700 Subject: [PATCH] Format fixes in vp9_rd_pick_inter_mode_sb Change-Id: Ie45687405dcaa34ba465dce2aa14f76017d3a794 --- vp9/encoder/vp9_rdopt.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 80d18ecf1..e36272144 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2794,9 +2794,9 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, continue; if ((mode_search_skip_flags & FLAG_SKIP_COMP_BESTINTRA) && - best_mode_index >=0 && - best_mbmode.ref_frame[0] == INTRA_FRAME) + best_mode_index >= 0 && best_mbmode.ref_frame[0] == INTRA_FRAME) continue; + mode_excluded = cm->reference_mode == SINGLE_REFERENCE; } else { if (ref_frame != INTRA_FRAME) @@ -3026,13 +3026,11 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, hybrid_rd = RDCOST(x->rdmult, x->rddiv, hybrid_rate, distortion2); if (!comp_pred) { - if (single_rd < best_pred_rd[SINGLE_REFERENCE]) { + if (single_rd < best_pred_rd[SINGLE_REFERENCE]) best_pred_rd[SINGLE_REFERENCE] = single_rd; - } } else { - if (single_rd < best_pred_rd[COMPOUND_REFERENCE]) { + if (single_rd < best_pred_rd[COMPOUND_REFERENCE]) best_pred_rd[COMPOUND_REFERENCE] = single_rd; - } } if (hybrid_rd < best_pred_rd[REFERENCE_MODE_SELECT]) best_pred_rd[REFERENCE_MODE_SELECT] = hybrid_rd;