vp9 aq-mode=3: Keep it on even at low bitrates.

Change-Id: I6a27db6b9dbe3d8cb3d47ef30fbd52557171cadd

diff --git a/vp9/encoder/vp9_aq_cyclicrefresh.c b/vp9/encoder/vp9_aq_cyclicrefresh.c
index 0982fd6ffc24c2ad799a46a9f3a1e85b8af6455f..4c75ffaa98e186c98383ab05877be32333839157 100644 (file)
--- a/vp9/encoder/vp9_aq_cyclicrefresh.c
+++ b/vp9/encoder/vp9_aq_cyclicrefresh.c
@@ -60,8 +60,6 @@ void vp9_cyclic_refresh_free(CYCLIC_REFRESH *cr) {
 }
 
 // Check if we should turn off cyclic refresh based on bitrate condition.
-// TODO(marpan): May be better in some cases to just reduce the amount/delta-qp
-// instead of completely shutting off.
 static int apply_cyclic_refresh_bitrate(const VP9_COMMON *cm,
                                         const RATE_CONTROL *rc) {
   // Turn off cyclic refresh if bits available per frame is not sufficiently
@@ -535,7 +533,10 @@ void vp9_cyclic_refresh_setup(VP9_COMP *const cpi) {
   const RATE_CONTROL *const rc = &cpi->rc;
   CYCLIC_REFRESH *const cr = cpi->cyclic_refresh;
   struct segmentation *const seg = &cm->seg;
-  const int apply_cyclic_refresh  = apply_cyclic_refresh_bitrate(cm, rc);
+  // TODO(marpan): Look into whether we should reduce the amount/delta-qp
+  // instead of completely shutting off at low bitrates. For now keep it on.
+  // const int apply_cyclic_refresh = apply_cyclic_refresh_bitrate(cm, rc);
+  const int apply_cyclic_refresh = 1;
   if (cm->current_video_frame == 0)
     cr->low_content_avg = 0.0;
   // Don't apply refresh on key frame or temporal enhancement layer frames.