shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Allow update of golden refernce buffer in CBR mode"

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -617,6 +617,8 @@

         continue;

       if (this_mode == NEWMV) {

+        if (ref_frame > LAST_FRAME)

+          continue;

         if (cpi->sf.partition_search_type != VAR_BASED_PARTITION &&

             this_rdc.rdcost < (int64_t)(1 << num_pels_log2_lookup[bsize]))

           continue;

@@ -757,7 +759,7 @@

     }

     // If the current reference frame is valid and we found a usable mode,

     // we are done.

-    if (best_rdc.rdcost < INT64_MAX)

+    if (best_rdc.rdcost < INT64_MAX && ref_frame == GOLDEN_FRAME)

       break;

   }

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

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

@@ -1339,7 +1339,18 @@

   const int64_t diff = rc->optimal_buffer_level - rc->buffer_level;

   const int64_t one_pct_bits = 1 + rc->optimal_buffer_level / 100;

   int min_frame_target = MAX(rc->avg_frame_bandwidth >> 4, FRAME_OVERHEAD_BITS);

-  int target = rc->avg_frame_bandwidth;

+  int target;

+

+  if (oxcf->gf_cbr_boost_pct) {

+    const int af_ratio_pct = oxcf->gf_cbr_boost_pct + 100;

+    target =  cpi->refresh_golden_frame ?

+      (rc->avg_frame_bandwidth * rc->baseline_gf_interval * af_ratio_pct) /

+      (rc->baseline_gf_interval * 100 + af_ratio_pct - 100) :

+      (rc->avg_frame_bandwidth * rc->baseline_gf_interval * 100) /

+      (rc->baseline_gf_interval * 100 + af_ratio_pct - 100);

+  } else {

+    target = rc->avg_frame_bandwidth;

+  }

   if (svc->number_temporal_layers > 1 &&

       oxcf->rc_mode == VPX_CBR) {

     // Note that for layers, avg_frame_bandwidth is the cumulative

@@ -1453,15 +1464,25 @@

     rc->frames_to_key = cpi->oxcf.key_freq;

     rc->kf_boost = DEFAULT_KF_BOOST;

     rc->source_alt_ref_active = 0;

-    target = calc_iframe_target_size_one_pass_cbr(cpi);

   } else {

     cm->frame_type = INTER_FRAME;

-    target = calc_pframe_target_size_one_pass_cbr(cpi);

   }

+  if (rc->frames_till_gf_update_due == 0) {

+    rc->baseline_gf_interval = DEFAULT_GF_INTERVAL;

+    rc->frames_till_gf_update_due = rc->baseline_gf_interval;

+    // NOTE: frames_till_gf_update_due must be <= frames_to_key.

+    if (rc->frames_till_gf_update_due > rc->frames_to_key)

+      rc->frames_till_gf_update_due = rc->frames_to_key;

+    cpi->refresh_golden_frame = 1;

+    rc->gfu_boost = DEFAULT_GF_BOOST;

+  }

+

+  if (cm->frame_type == KEY_FRAME)

+    target = calc_iframe_target_size_one_pass_cbr(cpi);

+  else

+    target = calc_pframe_target_size_one_pass_cbr(cpi);

+

   vp9_rc_set_frame_target(cpi, target);

-  // Don't use gf_update by default in CBR mode.

-  rc->frames_till_gf_update_due = INT_MAX;

-  rc->baseline_gf_interval = INT_MAX;

 }

 int vp9_compute_qdelta(const RATE_CONTROL *rc, double qstart, double qtarget,