shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Allow q adjustment for VPX_CQ and VPX_CBR."

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

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

@@ -2621,11 +2621,13 @@

   ++twopass->gf_group.index;

   // If the rate control is drifting consider adjustment to min or maxq.

-  if ((cpi->oxcf.rc_mode == VPX_VBR) &&

+  if ((cpi->oxcf.rc_mode != VPX_Q) &&

       (cpi->twopass.gf_zeromotion_pct < VLOW_MOTION_THRESHOLD) &&

       !cpi->rc.is_src_frame_alt_ref) {

     const int maxq_adj_limit =

       rc->worst_quality - twopass->active_worst_quality;

+    const int minq_adj_limit =

+      (cpi->oxcf.rc_mode == VPX_CQ) ? 0 : MINQ_ADJ_LIMIT;

     // Undershoot.

     if (rc->rate_error_estimate > cpi->oxcf.under_shoot_pct) {

@@ -2650,7 +2652,7 @@

         --twopass->extend_maxq;

     }

-    twopass->extend_minq = clamp(twopass->extend_minq, 0, MINQ_ADJ_LIMIT);

+    twopass->extend_minq = clamp(twopass->extend_minq, 0, minq_adj_limit);

     twopass->extend_maxq = clamp(twopass->extend_maxq, 0, maxq_adj_limit);

   }

 }

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

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

@@ -1050,7 +1050,7 @@

   // Extension to max or min Q if undershoot or overshoot is outside

   // the permitted range.

-  if ((cpi->oxcf.rc_mode == VPX_VBR) &&

+  if ((cpi->oxcf.rc_mode != VPX_Q) &&

       (cpi->twopass.gf_zeromotion_pct < VLOW_MOTION_THRESHOLD)) {

     if (frame_is_intra_only(cm) ||

         (!rc->is_src_frame_alt_ref &&