diff options
| author | Deb Mukherjee <debargha@google.com> | 2013-04-22 23:22:28 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-22 23:22:28 -0700 |
| commit | 611b26bbe04e83402dcddc545fdd21ca09241c30 (patch) | |
| tree | a5b72a94cd19490d7107b5e602649da76a513d01 /vp9/encoder/vp9_rdopt.c | |
| parent | 366ff224ef0d49039b8f4bc090ad5addaa1463cc (diff) | |
| parent | 735febf1ce071569e8aba26ae3c27df03626d09a (diff) | |
| download | libvpx-611b26bbe04e83402dcddc545fdd21ca09241c30.tar libvpx-611b26bbe04e83402dcddc545fdd21ca09241c30.tar.gz libvpx-611b26bbe04e83402dcddc545fdd21ca09241c30.tar.bz2 libvpx-611b26bbe04e83402dcddc545fdd21ca09241c30.zip | |
Merge "Removing the implicit compound inter experiment" into experimental
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 7009e32aa..03e47f0c7 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); |