diff options
| author | Marco <marpan@google.com> | 2016-10-04 14:13:17 -0700 |
|---|---|---|
| committer | Marco <marpan@google.com> | 2016-10-04 14:19:49 -0700 |
| commit | 955b3b66bdfc127f07381448daff7ece442b3b6c (patch) | |
| tree | 450ffe83569a0c1d7487ce50e945bb86ec41dd95 | |
| parent | 897870497024e4b6cbed4a6a7c1feeab438508f6 (diff) | |
| download | libvpx-955b3b66bdfc127f07381448daff7ece442b3b6c.tar libvpx-955b3b66bdfc127f07381448daff7ece442b3b6c.tar.gz libvpx-955b3b66bdfc127f07381448daff7ece442b3b6c.tar.bz2 libvpx-955b3b66bdfc127f07381448daff7ece442b3b6c.zip | |
vp8: Allow for cyclic refresh even if error_resilience it off.
cyclic_refresh was tied to error_resilience mode.
Allow it to be on also for 1 pass CBR mode even if
error_resilience is off.
Other option to use new control for this, but prefer to avoid
that for now.
Change-Id: I3625b292ee059a890e31338b514e211bf0ab5c3e
| -rw-r--r-- | vp8/encoder/onyx_if.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 87560f28b..acf181c51 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1766,9 +1766,11 @@ struct VP8_COMP *vp8_create_compressor(VP8_CONFIG *oxcf) { cpi->mse_source_denoised = 0; /* Should we use the cyclic refresh method. - * Currently this is tied to error resilliant mode + * Currently there is no external control for this. + * Enable it for error_resilient_mode, or for 1 pass CBR mode. */ - cpi->cyclic_refresh_mode_enabled = cpi->oxcf.error_resilient_mode; + cpi->cyclic_refresh_mode_enabled = (cpi->oxcf.error_resilient_mode || + (cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER && cpi->oxcf.Mode <= 2)); cpi->cyclic_refresh_mode_max_mbs_perframe = (cpi->common.mb_rows * cpi->common.mb_cols) / 7; if (cpi->oxcf.number_of_layers == 1) { |