shithub: libvpx

Info  •  Files  •  Log  •  Branches

Use the proper gfu_boost factor to compute rd_mult

Update the Lagrangian multiplier according to the gfu_boost factor
assigned per frame. It improves the multi-layer ARF compression
performance (results below shown for speed 0):

         avg PSNR      overall PSNR      SSIM
lowres    -0.08%          0.02%         -0.28%
midres    -0.08%          0.03%         -0.22%
hdres     -0.19%         -0.10%         -0.39%
nflx2k    -0.29%         -0.18%         -0.85%

Change-Id: Ifeb4b14918f880ba011ea41c1454ab00504f8855

--- a/vp9/encoder/vp9_firstpass.c

+++ b/vp9/encoder/vp9_firstpass.c

@@ -2127,6 +2127,7 @@

       gf_group->frame_gop_index[*index_counter] = idx;

       gf_group->rf_level[*index_counter] = INTER_NORMAL;

       gf_group->layer_depth[*index_counter] = depth;

+      gf_group->gfu_boost[*index_counter] = NORMAL_BOOST;

       ++(*index_counter);

     }

     return;

@@ -2170,6 +2171,7 @@

     gf_group->update_type[frame_index] = OVERLAY_UPDATE;

     gf_group->rf_level[frame_index] = INTER_NORMAL;

     gf_group->layer_depth[frame_index] = MAX_ARF_LAYERS - 1;

+    gf_group->gfu_boost[frame_index] = NORMAL_BOOST;

   } else {

     gf_group->update_type[frame_index] = GF_UPDATE;

     gf_group->rf_level[frame_index] = GF_ARF_STD;

--- a/vp9/encoder/vp9_rd.c

+++ b/vp9/encoder/vp9_rd.c

@@ -197,7 +197,10 @@

   if (cpi->oxcf.pass == 2 && (cpi->common.frame_type != KEY_FRAME)) {

     const GF_GROUP *const gf_group = &cpi->twopass.gf_group;

     const FRAME_UPDATE_TYPE frame_type = gf_group->update_type[gf_group->index];

-    const int boost_index = VPXMIN(15, (cpi->rc.gfu_boost / 100));

+    const int gfu_boost = cpi->multi_layer_arf

+                              ? gf_group->gfu_boost[gf_group->index]

+                              : cpi->rc.gfu_boost;

+    const int boost_index = VPXMIN(15, (gfu_boost / 100));

     rdmult = (rdmult * rd_frame_type_factor[frame_type]) >> 7;

     rdmult += ((rdmult * rd_boost_factor[boost_index]) >> 7);

@@ -229,7 +232,10 @@

   if (cpi->oxcf.pass == 2 && (cpi->common.frame_type != KEY_FRAME)) {

     const GF_GROUP *const gf_group = &cpi->twopass.gf_group;

     const FRAME_UPDATE_TYPE frame_type = gf_group->update_type[gf_group->index];

-    const int boost_index = VPXMIN(15, (cpi->rc.gfu_boost / 100));

+    const int gfu_boost = cpi->multi_layer_arf

+                              ? gf_group->gfu_boost[gf_group->index]

+                              : cpi->rc.gfu_boost;

+    const int boost_index = VPXMIN(15, (gfu_boost / 100));

     rdmult = (rdmult * rd_frame_type_factor[frame_type]) >> 7;

     rdmult += ((rdmult * rd_boost_factor[boost_index]) >> 7);