diff options
| author | Alex Converse <aconverse@google.com> | 2014-08-07 15:54:26 -0700 |
|---|---|---|
| committer | Alex Converse <aconverse@google.com> | 2014-08-07 15:57:58 -0700 |
| commit | 2a5c46d8f515239ca079694546cf30fc4e700167 (patch) | |
| tree | ba3813f222fa0acf815b2cc26c9c4efed808ff74 /vp9/encoder | |
| parent | e874aea74cb07ab6f6ea35d9d3ab60aab4980873 (diff) | |
| download | libvpx-2a5c46d8f515239ca079694546cf30fc4e700167.tar libvpx-2a5c46d8f515239ca079694546cf30fc4e700167.tar.gz libvpx-2a5c46d8f515239ca079694546cf30fc4e700167.tar.bz2 libvpx-2a5c46d8f515239ca079694546cf30fc4e700167.zip | |
Fix active_map speed 6.
Fix the interaction between active map and reuse_inter_pred_sby. The
reuse_inter_pred_sby feature expects inter predictors to already be
built, but blocks with active map on skip this step.
Change-Id: Ibb2bf0d228f678935d82a0ede9cb0919ab7c8878
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index a18d81194..d3f5bfaa9 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3613,7 +3613,7 @@ 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); } - if (!cpi->sf.reuse_inter_pred_sby) + if (!cpi->sf.reuse_inter_pred_sby || seg_skip) 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)); |