diff options
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index f0e4901d5..1fd4a036a 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -6098,11 +6098,20 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, // Is multi-arf enabled. // Note that at the moment multi_arf is only configured for 2 pass VBR and // will not work properly with svc. - if ((oxcf->pass == 2) && !cpi->use_svc && (cpi->oxcf.enable_auto_arf > 1)) + // TODO(jingning): enable dual ARF encoding when auto-alt-ref is set to be 2. + // We will refactor and integrate the dual ARF and multi-layer ARF system + // next and deprecate this special control setting, instead make auto-alt-ref + // directly controls the ARF layer depth. + if ((oxcf->pass == 2) && !cpi->use_svc && (cpi->oxcf.enable_auto_arf == 2)) cpi->multi_arf_allowed = 1; else cpi->multi_arf_allowed = 0; + if (oxcf->pass == 2 && !cpi->use_svc && cpi->oxcf.enable_auto_arf > 2) + cpi->multi_layer_arf = 1; + else + cpi->multi_layer_arf = 0; + // Normal defaults cm->reset_frame_context = 0; cm->refresh_frame_context = 1; |