ref: 1d12a125e7a1925e9f1e69cca818ba3458295f98
parent: a6b625828401d2635fcdb7514a7f38f41409a0ae
parent: 84f106f1988294e06940f0e943c28fa741c4d099
author: Marco Paniconi <marpan@google.com>
date: Wed Feb 22 22:24:26 EST 2017
Merge "vp9: 1pass CBR: modify condition for reducing loop filter."
--- a/vp9/encoder/vp9_picklpf.c
+++ b/vp9/encoder/vp9_picklpf.c
@@ -182,6 +182,7 @@
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;