From 735febf1ce071569e8aba26ae3c27df03626d09a Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Mon, 22 Apr 2013 16:29:34 -0700 Subject: Removing the implicit compound inter experiment Removing this experiment for now, since it has been broken with the latest code changes. Change-Id: I1be2181b56de490fcb577f5905b5e147a8ed82d8 --- vp9/encoder/vp9_rdopt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'vp9/encoder/vp9_rdopt.c') diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 18ad10b8e..b34147094 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1755,8 +1755,7 @@ static int64_t encode_inter_mb_segment(VP9_COMMON *const cm, vp9_build_inter_predictor( *(bd->base_second_pre) + bd->pre, bd->pre_stride, *(bd->base_dst) + bd->dst, bd->dst_stride, - &bd->bmi.as_mv[1], &xd->scale_factor[1], 4, 4, - 1 << (2 * CONFIG_IMPLICIT_COMPOUNDINTER_WEIGHT) /* avg */, + &bd->bmi.as_mv[1], &xd->scale_factor[1], 4, 4, 1, &xd->subpix); } @@ -1822,8 +1821,7 @@ static int64_t encode_inter_mb_segment_8x8(VP9_COMMON *const cm, *base_pre + bd->pre, bd->pre_stride, *(bd->base_dst) + bd->dst, bd->dst_stride, &bd->bmi.as_mv[which_mv], &xd->scale_factor[which_mv], 8, 8, - which_mv << (2 * CONFIG_IMPLICIT_COMPOUNDINTER_WEIGHT), - &xd->subpix); + which_mv, &xd->subpix); } vp9_subtract_4b_c(be, bd, 16); -- cgit v1.2.3