shithub: libvpx

Info  •  Files  •  Log  •  Branches

vp9-svc: Fix some stats in vp9_spatial_svc_encoder.

Correction to rate control stats output under -rcstat.

Change-Id: I46fa5d2a66ed657121ee3d685608a148bb9a7bb3

--- a/examples/vp9_spatial_svc_encoder.c

+++ b/examples/vp9_spatial_svc_encoder.c

@@ -423,7 +423,6 @@

   for (sl = 0; sl < cfg->ss_number_layers; ++sl) {

     for (tl = 0; tl < cfg->ts_number_layers; ++tl) {

       const int layer = sl * cfg->ts_number_layers + tl;

-      const int tlayer0 = sl * cfg->ts_number_layers;

       if (cfg->ts_number_layers == 1)

         rc->layer_framerate[layer] = framerate;

       else

@@ -434,8 +433,8 @@

                       cfg->layer_target_bitrate[layer - 1]) /

             (rc->layer_framerate[layer] - rc->layer_framerate[layer - 1]);

       } else {

-        rc->layer_pfb[tlayer0] = 1000.0 * cfg->layer_target_bitrate[tlayer0] /

-                                 rc->layer_framerate[tlayer0];

+        rc->layer_pfb[layer] = 1000.0 * cfg->layer_target_bitrate[layer] /

+                               rc->layer_framerate[layer];

       }

       rc->layer_input_frames[layer] = 0;

       rc->layer_enc_frames[layer] = 0;

@@ -455,12 +454,13 @@

                                           vpx_codec_enc_cfg_t *cfg,

                                           int frame_cnt) {

   unsigned int sl, tl;

-  int tot_num_frames = 0;

   double perc_fluctuation = 0.0;

+  int tot_num_frames = 0;

   printf("Total number of processed frames: %d\n\n", frame_cnt - 1);

   printf("Rate control layer stats for sl%d tl%d layer(s):\n\n",

          cfg->ss_number_layers, cfg->ts_number_layers);

   for (sl = 0; sl < cfg->ss_number_layers; ++sl) {

+    tot_num_frames = 0;

     for (tl = 0; tl < cfg->ts_number_layers; ++tl) {

       const int layer = sl * cfg->ts_number_layers + tl;

       const int num_dropped =

@@ -468,7 +468,7 @@

               ? (rc->layer_input_frames[layer] - rc->layer_enc_frames[layer])

               : (rc->layer_input_frames[layer] - rc->layer_enc_frames[layer] -

                  1);

-      if (!sl) tot_num_frames += rc->layer_input_frames[layer];

+      tot_num_frames += rc->layer_input_frames[layer];

       rc->layer_encoding_bitrate[layer] = 0.001 * rc->layer_framerate[layer] *

                                           rc->layer_encoding_bitrate[layer] /

                                           tot_num_frames;