diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-03-25 14:27:45 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2014-03-25 14:27:45 -0700 |
| commit | 6eb2cacf0d24a216c183fd0c5e34cdf98df5d9bd (patch) | |
| tree | 355347aa68322f716cb29c68896c77f54cf17f3b /vp9/encoder/vp9_encodeframe.c | |
| parent | de8fd6f48addd94034cdfd9170bdfe52d9481e30 (diff) | |
| download | libvpx-6eb2cacf0d24a216c183fd0c5e34cdf98df5d9bd.tar libvpx-6eb2cacf0d24a216c183fd0c5e34cdf98df5d9bd.tar.gz libvpx-6eb2cacf0d24a216c183fd0c5e34cdf98df5d9bd.tar.bz2 libvpx-6eb2cacf0d24a216c183fd0c5e34cdf98df5d9bd.zip | |
Added a speed feature "allow_skip_recode"
This commit added a speed feature to make the logic of calculating
skip_recode on a block level more explicit. This also enable the
feature to be enabled at speed 5 where the previous logic is too
conservative, help gain back the lost speed for --rt(-5).
Change-Id: Ieb37ca3e85c2e7bda343486edf13d5f5395f2233
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 100162883..5837313c0 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3454,11 +3454,9 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled, const int mi_height = num_8x8_blocks_high_lookup[bsize]; x->skip_recode = !x->select_txfm_size && mbmi->sb_type >= BLOCK_8X8 && - (cpi->oxcf.aq_mode != COMPLEXITY_AQ && - cpi->oxcf.aq_mode != CYCLIC_REFRESH_AQ) && - !cpi->sf.use_nonrd_pick_mode && - !cpi->sf.use_uv_intra_rd_estimate && - !cpi->sf.skip_encode_sb; + cpi->oxcf.aq_mode != COMPLEXITY_AQ && + cpi->oxcf.aq_mode != CYCLIC_REFRESH_AQ && + cpi->sf.allow_skip_recode; x->skip_optimize = ctx->is_coded; ctx->is_coded = 1; |