summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Paniconi <marpan@google.com>2017-02-23 03:24:26 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-02-23 03:24:26 +0000
commit1d12a125e7a1925e9f1e69cca818ba3458295f98 (patch)
tree538115d08f1b53b98994a7b02402685f23c9a61a
parenta6b625828401d2635fcdb7514a7f38f41409a0ae (diff)
parent84f106f1988294e06940f0e943c28fa741c4d099 (diff)
downloadlibvpx-1d12a125e7a1925e9f1e69cca818ba3458295f98.tar
libvpx-1d12a125e7a1925e9f1e69cca818ba3458295f98.tar.gz
libvpx-1d12a125e7a1925e9f1e69cca818ba3458295f98.tar.bz2
libvpx-1d12a125e7a1925e9f1e69cca818ba3458295f98.zip
Merge "vp9: 1pass CBR: modify condition for reducing loop filter."
-rw-r--r--vp9/encoder/vp9_picklpf.c1
1 files changed, 1 insertions, 0 deletions
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;