From: Marco <marpan@google.com>
Date: Tue, 4 Oct 2016 21:13:17 +0000 (-0700)
Subject: vp8: Allow for cyclic refresh even if error_resilience it off.
X-Git-Tag: v1.6.1~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=955b3b66bdfc127f07381448daff7ece442b3b6c;p=libvpx

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
---

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) {