shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove the unneeded output_framerate from svc."

--- a/examples/vpx_temporal_scalable_patterns.c

+++ b/examples/vpx_temporal_scalable_patterns.c

@@ -526,7 +526,7 @@

   // Enable error resilient mode.

   cfg.g_error_resilient = 1;

   cfg.g_lag_in_frames   = 0;

-  cfg.kf_mode = VPX_KF_DISABLED;

+  cfg.kf_mode = VPX_KF_AUTO;

   // Disable automatic keyframe placement.

   cfg.kf_min_dist = cfg.kf_max_dist = 3000;

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

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

@@ -1258,17 +1258,25 @@

 static int calc_iframe_target_size_one_pass_cbr(const VP9_COMP *cpi) {

   const RATE_CONTROL *rc = &cpi->rc;

+  const VP9_CONFIG *oxcf = &cpi->oxcf;

+  const SVC *const svc = &cpi->svc;

   int target;

-

   if (cpi->common.current_video_frame == 0) {

     target = ((cpi->oxcf.starting_buffer_level / 2) > INT_MAX)

       ? INT_MAX : (int)(cpi->oxcf.starting_buffer_level / 2);

   } else {

-    const int initial_boost = 32;

-    int kf_boost = MAX(initial_boost, (int)(2 * cpi->output_framerate - 16));

-    if (rc->frames_since_key < cpi->output_framerate / 2) {

+    int kf_boost = 32;

+    double framerate = oxcf->framerate;

+    if (svc->number_temporal_layers > 1 &&

+        oxcf->end_usage == USAGE_STREAM_FROM_SERVER) {

+      // Use the layer framerate for temporal layers CBR mode.

+      const LAYER_CONTEXT *lc = &svc->layer_context[svc->temporal_layer_id];

+      framerate = lc->framerate;

+    }

+    kf_boost = MAX(kf_boost, (int)(2 * framerate - 16));

+    if (rc->frames_since_key <  framerate / 2) {

       kf_boost = (int)(kf_boost * rc->frames_since_key /

-                       (cpi->output_framerate / 2));

+                       (framerate / 2));

     }

     target = ((16 + kf_boost) * rc->av_per_frame_bandwidth) >> 4;

   }

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

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

@@ -178,7 +178,6 @@

   cpi->oxcf.starting_buffer_level = lc->starting_buffer_level;

   cpi->oxcf.optimal_buffer_level = lc->optimal_buffer_level;

   cpi->oxcf.maximum_buffer_size = lc->maximum_buffer_size;

-  cpi->output_framerate = lc->framerate;

   // Reset the frames_since_key and frames_to_key counters to their values

   // before the layer restore. Keep these defined for the stream (not layer).

   if (cpi->svc.number_temporal_layers > 1) {

@@ -197,7 +196,6 @@

   lc->starting_buffer_level = oxcf->starting_buffer_level;

   lc->optimal_buffer_level = oxcf->optimal_buffer_level;

   lc->maximum_buffer_size = oxcf->maximum_buffer_size;

-  lc->framerate = cpi->output_framerate;

 }

 void vp9_init_second_pass_spatial_svc(VP9_COMP *cpi) {