From 4300e50ccedd345778ef23227fee1e37b6ef7359 Mon Sep 17 00:00:00 2001 From: Julia Robson Date: Wed, 6 Apr 2016 11:16:57 +0100 Subject: [PATCH] Fixing assertion in *Large unit tests In certain cases the code was subtracting the obmc cost despite it not having been added previously. For example with ref_mv, supertx, ext_inter, obmc & ext_refs enabled the following test was failing but now passes: "VP10/ArfFreqTestLarge.MinArfFreqTest/33" Change-Id: I966853f34c18d5a1d4c7a56fa201c1b02973fc88 --- vp10/encoder/rdopt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c index ec4927e8e..980155bd9 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c @@ -8579,7 +8579,7 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi, *returnrate_nocoef -= vp10_cost_bit(vp10_get_intra_inter_prob(cm, xd), mbmi->ref_frame[0] != INTRA_FRAME); #if CONFIG_OBMC - if (is_inter_block(mbmi) && is_obmc_allowed(mbmi)) + if (is_neighbor_overlappable(mbmi) && is_obmc_allowed(mbmi)) *returnrate_nocoef -= cpi->obmc_cost[bsize][mbmi->obmc]; #endif // CONFIG_OBMC #endif // CONFIG_SUPERTX -- 2.40.0