shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9-svc: Fix to SVC for frame dropping."

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

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

@@ -4593,6 +4593,16 @@

   cpi->last_frame_dropped = 0;

   cpi->svc.last_layer_dropped[cpi->svc.spatial_layer_id] = 0;

+  // Keep track of the frame buffer index updated/refreshed for the

+  // current encoded TL0 superframe.

+  if (cpi->svc.temporal_layer_id == 0) {

+    if (cpi->refresh_last_frame)

+      cpi->svc.fb_idx_upd_tl0[cpi->svc.spatial_layer_id] = cpi->lst_fb_idx;

+    else if (cpi->refresh_golden_frame)

+      cpi->svc.fb_idx_upd_tl0[cpi->svc.spatial_layer_id] = cpi->gld_fb_idx;

+    else if (cpi->refresh_alt_ref_frame)

+      cpi->svc.fb_idx_upd_tl0[cpi->svc.spatial_layer_id] = cpi->alt_fb_idx;

+  }

   // Disable segmentation if it decrease rate/distortion ratio

   if (cpi->oxcf.aq_mode == LOOKAHEAD_AQ)

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

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

@@ -786,6 +786,15 @@

   if (cpi->svc.spatial_layer_id == 0) cpi->svc.high_source_sad_superframe = 0;

+  if (cpi->svc.temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_BYPASS &&

+      cpi->svc.last_layer_dropped[cpi->svc.spatial_layer_id]) {

+    // For fixed/non-flexible mode, if the previous frame (same spatial layer

+    // from previous superframe) was dropped, make sure the lst_fb_idx

+    // for this frame corresponds to the buffer index updated on (last) encoded

+    // TL0 frame (with same spatial layer).

+    cpi->lst_fb_idx = cpi->svc.fb_idx_upd_tl0[cpi->svc.spatial_layer_id];

+  }

+

   if (vp9_set_size_literal(cpi, width, height) != 0)

     return VPX_CODEC_INVALID_PARAM;

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

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

@@ -138,6 +138,10 @@

   uint8_t reference_last[VPX_SS_MAX_LAYERS];

   uint8_t reference_golden[VPX_SS_MAX_LAYERS];

   uint8_t reference_altref[VPX_SS_MAX_LAYERS];

+

+  // Keep track of the frame buffer index updated/refreshed on the base

+  // temporal superframe.

+  uint8_t fb_idx_upd_tl0[VPX_SS_MAX_LAYERS];

 } SVC;

 struct VP9_COMP;