// 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.
- // 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)
+ // Enable the Jingning's new "multi_layer_arf" code if "enable_auto_arf"
+ // is greater than or equal to 2.
+ 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;
int idx;
// Process regular P frames
- if (end - start < min_frame_interval) {
+ if ((end - start < min_frame_interval) ||
+ (depth > cpi->oxcf.enable_auto_arf)) {
int idx;
for (idx = start; idx < end; ++idx) {
gf_group->update_type[*index_counter] = LF_UPDATE;