shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9-svc: Fix on disabling inter_layer prediction."

--- a/vp9/encoder/vp9_svc_layercontext.c

+++ b/vp9/encoder/vp9_svc_layercontext.c

@@ -909,12 +909,11 @@

       }

     }

   }

-  // Check for disabling inter-layer prediction if

-  // INTER_LAYER_PRED_ON_CONSTRAINED is enabled.

-  // If the reference for inter-layer prediction (the reference that is scaled)

-  // is not the previous spatial layer from the same superframe, then we

-  // disable inter-layer prediction.

-  if (cpi->svc.disable_inter_layer_pred == INTER_LAYER_PRED_ON_CONSTRAINED) {

+  // Check for disabling inter-layer prediction if the reference for inter-layer

+  // prediction (the reference that is scaled) is not the previous spatial layer

+  // from the same superframe, then we disable inter-layer prediction.

+  // Only need to check when inter_layer prediction is not set to OFF mode.

+  if (cpi->svc.disable_inter_layer_pred != INTER_LAYER_PRED_OFF) {

     // We only use LAST and GOLDEN for prediction in real-time mode, so we

     // check both here.

     MV_REFERENCE_FRAME ref_frame;