shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "VP9-SVC: Allow frame dropping due to overshoot for spatial layers."

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

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

@@ -3797,14 +3797,17 @@

   }

   // For 1 pass CBR, check if we are dropping this frame.

-  // Never drop on key frame.

+  // For spatial layers, for now only check for frame-dropping on first spatial

+  // layer, and if decision is to drop, we drop whole super-frame.

   if (oxcf->pass == 0 &&

       oxcf->rc_mode == VPX_CBR &&

       cm->frame_type != KEY_FRAME) {

-    if (vp9_rc_drop_frame(cpi)) {

+    if (vp9_rc_drop_frame(cpi) ||

+        (is_one_pass_cbr_svc(cpi) && cpi->svc.rc_drop_superframe == 1)) {

       vp9_rc_postencode_update_drop_frame(cpi);

       ++cm->current_video_frame;

       cpi->ext_refresh_frame_flags_pending = 0;

+      cpi->svc.rc_drop_superframe = 1;

       return;

     }

   }

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

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

@@ -370,8 +370,9 @@

 int vp9_rc_drop_frame(VP9_COMP *cpi) {

   const VP9EncoderConfig *oxcf = &cpi->oxcf;

   RATE_CONTROL *const rc = &cpi->rc;

-

-  if (!oxcf->drop_frames_water_mark) {

+  if (!oxcf->drop_frames_water_mark ||

+      (is_one_pass_cbr_svc(cpi) &&

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

     return 0;

   } else {

     if (rc->buffer_level < 0) {

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

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

@@ -31,6 +31,7 @@

   svc->spatial_layer_id = 0;

   svc->temporal_layer_id = 0;

   svc->first_spatial_layer_to_encode = 0;

+  svc->rc_drop_superframe = 0;

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

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

@@ -567,6 +568,9 @@

       cpi->alt_fb_idx = cpi->svc.ext_alt_fb_idx[sl];

     }

   }

+

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

+    cpi->svc.rc_drop_superframe = 0;

   lc = &cpi->svc.layer_context[cpi->svc.spatial_layer_id *

                                cpi->svc.number_temporal_layers +

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

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

@@ -56,6 +56,7 @@

   int spatial_layer_to_encode;

   int first_spatial_layer_to_encode;

+  int rc_drop_superframe;

   // Workaround for multiple frame contexts

   enum {

--- a/vpx/src/svc_encodeframe.c

+++ b/vpx/src/svc_encodeframe.c

@@ -485,6 +485,7 @@

     enc_cfg->rc_buf_initial_sz = 500;

     enc_cfg->rc_buf_optimal_sz = 600;

     enc_cfg->rc_buf_sz = 1000;

+    enc_cfg->rc_dropframe_thresh = 0;

   }

   if (enc_cfg->g_error_resilient == 0 && si->use_multiple_frame_contexts == 0)