shithub: libvpx

Info  •  Files  •  Log  •  Branches

Add first_spatial_layer_to_encode to SVC.

Use the existing VP9_SET_SVC control to set the
first spatial layer to encode.

Since we loop over all spatial layers inside the encoder, the
setting of spatial_layer_id via VP9_SET_SVC has no relevance.
Use it instead to set the first_spatial_layer_to_encode,
which allows an application to skip encoding lower layer(s).

Change only affects the 1 pass CBR SVC.

Change-Id: I5d63ab713c3e250fdf42c637f38d5ec8f60cd1fb

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -4279,7 +4279,8 @@

       // non-zero spatial layer, it should not be an intra picture.

       // TODO(Won Kap): this needs to change if per-layer intra frame is

       // allowed.

-      if ((source->flags & VPX_EFLAG_FORCE_KF) && cpi->svc.spatial_layer_id) {

+      if ((source->flags & VPX_EFLAG_FORCE_KF) &&

+          cpi->svc.spatial_layer_id > cpi->svc.first_spatial_layer_to_encode) {

         source->flags &= ~(unsigned int)(VPX_EFLAG_FORCE_KF);

       }

--- a/vp9/encoder/vp9_ratectrl.c

+++ b/vp9/encoder/vp9_ratectrl.c

@@ -1595,7 +1595,7 @@

       cpi->ref_frame_flags &= (~VP9_ALT_FLAG);

     } else if (is_one_pass_cbr_svc(cpi)) {

       LAYER_CONTEXT *lc = &cpi->svc.layer_context[layer];

-      if (cpi->svc.spatial_layer_id == 0) {

+      if (cpi->svc.spatial_layer_id == cpi->svc.first_spatial_layer_to_encode) {

         lc->is_key_frame = 0;

       } else {

         lc->is_key_frame =

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

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

@@ -30,6 +30,7 @@

   svc->spatial_layer_id = 0;

   svc->temporal_layer_id = 0;

+  svc->first_spatial_layer_to_encode = 0;

   if (cpi->oxcf.error_resilient_mode == 0 && cpi->oxcf.pass == 2) {

     if (vpx_realloc_frame_buffer(&cpi->svc.empty_frame.img,

--- a/vp9/encoder/vp9_svc_layercontext.h

+++ b/vp9/encoder/vp9_svc_layercontext.h

@@ -55,6 +55,7 @@

   int number_temporal_layers;

   int spatial_layer_to_encode;

+  int first_spatial_layer_to_encode;

   // Workaround for multiple frame contexts

   enum {

--- a/vp9/vp9_cx_iface.c

+++ b/vp9/vp9_cx_iface.c

@@ -1372,7 +1372,7 @@

   VP9_COMP *const cpi = (VP9_COMP *)ctx->cpi;

   SVC *const svc = &cpi->svc;

-  svc->spatial_layer_id = data->spatial_layer_id;

+  svc->first_spatial_layer_to_encode = data->spatial_layer_id;

   svc->temporal_layer_id = data->temporal_layer_id;

   // Checks on valid layer_id input.

   if (svc->temporal_layer_id < 0 ||

@@ -1379,10 +1379,13 @@

       svc->temporal_layer_id >= (int)ctx->cfg.ts_number_layers) {

     return VPX_CODEC_INVALID_PARAM;

   }

-  if (svc->spatial_layer_id < 0 ||

-      svc->spatial_layer_id >= (int)ctx->cfg.ss_number_layers) {

+  if (svc->first_spatial_layer_to_encode < 0 ||

+      svc->first_spatial_layer_to_encode >= (int)ctx->cfg.ss_number_layers) {

     return VPX_CODEC_INVALID_PARAM;

   }

+  // First spatial layer to encode not implemented for two-pass.

+  if (is_two_pass_svc(cpi) && svc->first_spatial_layer_to_encode > 0)

+    return VPX_CODEC_INVALID_PARAM;

   return VPX_CODEC_OK;

 }