From fd5463571e468e4408819c0d035680d1bc897852 Mon Sep 17 00:00:00 2001 From: Geza Lore Date: Wed, 10 Feb 2016 13:34:39 +0000 Subject: [PATCH] Fix double counting of compound reference bit cost. These costs are added in separately just before the computed ref_costs_* are added in the calling functions, so they were effectively double counted. Change-Id: Ic941d0243460cc2e750791cfc508e97d8b90e8fd --- vp10/encoder/rdopt.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c index f22727220..ee0c0dc69 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c @@ -4573,9 +4573,6 @@ static void estimate_ref_frame_costs(const VP10_COMMON *cm, #endif // CONFIG_EXT_REFS unsigned int base_cost = vp10_cost_bit(intra_inter_p, 1); - if (cm->reference_mode == REFERENCE_MODE_SELECT) - base_cost += vp10_cost_bit(comp_inter_p, 0); - ref_costs_single[LAST_FRAME] = #if CONFIG_EXT_REFS ref_costs_single[LAST2_FRAME] = @@ -4631,9 +4628,6 @@ static void estimate_ref_frame_costs(const VP10_COMMON *cm, #endif // CONFIG_EXT_REFS unsigned int base_cost = vp10_cost_bit(intra_inter_p, 1); - if (cm->reference_mode == REFERENCE_MODE_SELECT) - base_cost += vp10_cost_bit(comp_inter_p, 1); - ref_costs_comp[LAST_FRAME] = #if CONFIG_EXT_REFS ref_costs_comp[LAST2_FRAME] = -- 2.40.0