shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Adjust arf Q limits with multi-arf."

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

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

@@ -892,21 +892,20 @@

   *bottom_index = active_best_quality;

 #if LIMIT_QRANGE_FOR_ALTREF_AND_KEY

+  vp9_clear_system_state();

   {

-    int qdelta = 0;

-    vp9_clear_system_state();

-

-    // Limit Q range for the adaptive loop.

-    if ((cm->frame_type == KEY_FRAME || vp9_is_upper_layer_key_frame(cpi)) &&

-        !rc->this_key_frame_forced) {

-      qdelta = vp9_compute_qdelta_by_rate(&cpi->rc, cm->frame_type,

-                                          active_worst_quality, 2.0);

-    } else if (!rc->is_src_frame_alt_ref &&

-               (oxcf->rc_mode != VPX_CBR) &&

-               (cpi->refresh_alt_ref_frame)) {

-      qdelta = vp9_compute_qdelta_by_rate(&cpi->rc, cm->frame_type,

-                                          active_worst_quality, 1.75);

-    }

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

+    const double rate_factor_deltas[RATE_FACTOR_LEVELS] = {

+      1.00,  // INTER_NORMAL

+      1.00,  // INTER_HIGH

+      1.50,  // GF_ARF_LOW

+      1.75,  // GF_ARF_STD

+      2.00,  // KF_STD

+    };

+    const double rate_factor =

+      rate_factor_deltas[gf_group->rf_level[gf_group->index]];

+    int qdelta = vp9_compute_qdelta_by_rate(&cpi->rc, cm->frame_type,

+                                            active_worst_quality, rate_factor);

     *top_index = active_worst_quality + qdelta;

     *top_index = (*top_index > *bottom_index) ? *top_index : *bottom_index;

   }