Increase the active best quality in CQ

For boosted frames, active best quality is increased.

Change-Id: I282fbefaf16b4216f5d22d344f098e6a5766c4a5

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index b51f6797b1af16d90f805e3f2e619c6a1a86ee6a..e764124922a07c8d7752e349044989d90a4c43a3 100644 (file)
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -1441,14 +1441,9 @@ static int rc_pick_q_and_bounds_two_pass(const VP9_COMP *cpi, int *bottom_index,
     // For constrained quality dont allow Q less than the cq level
     if (oxcf->rc_mode == VPX_CQ) {
       if (q < cq_level) q = cq_level;
-
-      active_best_quality = get_gf_active_quality(cpi, q, cm->bit_depth);
-
-      // Constrained quality use slightly lower active best.
-      active_best_quality = active_best_quality * 15 / 16;
-    } else {
-      active_best_quality = get_gf_active_quality(cpi, q, cm->bit_depth);
     }
+    active_best_quality = get_gf_active_quality(cpi, q, cm->bit_depth);
+
     // Modify best quality for second level arfs. For mode VPX_Q this
     // becomes the baseline frame q.
     if (gf_group->rf_level[gf_group_index] == GF_ARF_LOW) {