From: Marco <marpan@google.com>
Date: Wed, 22 Feb 2017 23:06:28 +0000 (-0800)
Subject: vp9: 1pass CBR: modify condition for reducing loop filter.
X-Git-Tag: v1.7.0~680^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84f106f1988294e06940f0e943c28fa741c4d099;p=libvpx

vp9: 1pass CBR: modify condition for reducing loop filter.

The reduction showed improvement on RTC when aq-mode=3 is on.
Add that (cyclic refresh enabled) to the condition.

Only affects 1 pass CBR.

Change-Id: I5d0843002d8e31d7c165098a62e7a71146b08664
---

diff --git a/vp9/encoder/vp9_picklpf.c b/vp9/encoder/vp9_picklpf.c
index c7e0c9ad3..1c2c55b9e 100644
--- a/vp9/encoder/vp9_picklpf.c
+++ b/vp9/encoder/vp9_picklpf.c
@@ -182,6 +182,7 @@ void vp9_pick_filter_level(const YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi,
     int filt_guess = ROUND_POWER_OF_TWO(q * 20723 + 1015158, 18);
 #endif  // CONFIG_VP9_HIGHBITDEPTH
     if (cpi->oxcf.pass == 0 && cpi->oxcf.rc_mode == VPX_CBR &&
+        cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cm->seg.enabled &&
         cpi->oxcf.content != VP9E_CONTENT_SCREEN && cm->frame_type != KEY_FRAME)
       filt_guess = 5 * filt_guess >> 3;