ref: c22b17dcefe05981918e4b7d0b6527c27e9ceda8
parent: 78e2da3e42cd77859f95fb4555b33bfae9ef3799
parent: 5d6c1c2d8f054c94c4f7f81bc5215af3ded04b4c
author: Marco Paniconi <[email protected]>
date: Mon Jul 31 22:48:13 EDT 2017
Merge "vp9: Adjust noise estimation for 360p."
--- a/vp9/encoder/vp9_noise_estimate.c
+++ b/vp9/encoder/vp9_noise_estimate.c
@@ -34,7 +34,7 @@
} else if (width * height >= 1280 * 720) {
ne->thresh = 140;
} else if (width * height >= 640 * 360) {
- ne->thresh = 100;
+ ne->thresh = 115;
}
ne->num_frames_estimate = 15;
}
@@ -56,8 +56,8 @@
if (cpi->oxcf.pass == 0 && cpi->oxcf.rc_mode == VPX_CBR &&
cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cpi->oxcf.speed >= 5 &&
cpi->resize_state == ORIG && cpi->resize_pending == 0 && !cpi->use_svc &&
- cpi->oxcf.content != VP9E_CONTENT_SCREEN && cpi->common.width >= 640 &&
- cpi->common.height >= 360)
+ cpi->oxcf.content != VP9E_CONTENT_SCREEN &&
+ cpi->common.width * cpi->common.height >= 640 * 360)
return 1;
else
return 0;