From 2de7cbe98007e0b70ca6088773434e179b3c83c1 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Sun, 3 Nov 2013 09:14:46 -0800 Subject: [PATCH] Add second ref frame check back in rdcost hist Update best_inter_rd and best_inter_ref_frame only in single ref frame case. Change-Id: Id56825b231a62d6852bd83811410c05a7569f715 --- vp9/encoder/vp9_rdopt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index f69b19beb..682a2a690 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3544,8 +3544,9 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, } // Keep record of best inter rd with single reference - if (is_inter_block(&xd->mi_8x8[0]->mbmi) && !mode_excluded && - this_rd < best_inter_rd) { + if (is_inter_block(&xd->mi_8x8[0]->mbmi) && + !has_second_ref(&xd->mi_8x8[0]->mbmi) && + !mode_excluded && this_rd < best_inter_rd) { best_inter_rd = this_rd; best_inter_ref_frame = ref_frame; } -- 2.40.0