diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2014-06-25 08:18:33 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-25 08:18:33 -0700 |
| commit | bccc785f63458136a8a72a51ed7b34a5811ffc4f (patch) | |
| tree | b6e7e9cec008a521af0d3ab72be35cd128879ba7 /vp9/encoder/vp9_encodeframe.c | |
| parent | b8c382f8e76e0ee313b15e61ac658271e2047849 (diff) | |
| parent | 0aae10007684fc3aa84ebf38a1a1d20e12ca8930 (diff) | |
| download | libvpx-bccc785f63458136a8a72a51ed7b34a5811ffc4f.tar libvpx-bccc785f63458136a8a72a51ed7b34a5811ffc4f.tar.gz libvpx-bccc785f63458136a8a72a51ed7b34a5811ffc4f.tar.bz2 libvpx-bccc785f63458136a8a72a51ed7b34a5811ffc4f.zip | |
Merge "Reuse inter prediction result in real-time speed 6"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index f031c18d9..b9349a49a 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3318,7 +3318,10 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled, vp9_setup_pre_planes(xd, ref, cfg, mi_row, mi_col, &xd->block_refs[ref]->sf); } - vp9_build_inter_predictors_sb(xd, mi_row, mi_col, MAX(bsize, BLOCK_8X8)); + if (!cpi->sf.reuse_inter_pred_sby) + vp9_build_inter_predictors_sby(xd, mi_row, mi_col, MAX(bsize, BLOCK_8X8)); + + vp9_build_inter_predictors_sbuv(xd, mi_row, mi_col, MAX(bsize, BLOCK_8X8)); if (!x->skip) { mbmi->skip = 1; |