diff options
| author | Marco Paniconi <marpan@google.com> | 2017-08-01 02:48:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-01 02:48:13 +0000 |
| commit | c22b17dcefe05981918e4b7d0b6527c27e9ceda8 (patch) | |
| tree | 3dabd1e6258c55d09a962d7e46267b3aa9e3ec66 | |
| parent | 78e2da3e42cd77859f95fb4555b33bfae9ef3799 (diff) | |
| parent | 5d6c1c2d8f054c94c4f7f81bc5215af3ded04b4c (diff) | |
| download | libvpx-c22b17dcefe05981918e4b7d0b6527c27e9ceda8.tar libvpx-c22b17dcefe05981918e4b7d0b6527c27e9ceda8.tar.gz libvpx-c22b17dcefe05981918e4b7d0b6527c27e9ceda8.tar.bz2 libvpx-c22b17dcefe05981918e4b7d0b6527c27e9ceda8.zip | |
Merge "vp9: Adjust noise estimation for 360p."
| -rw-r--r-- | vp9/encoder/vp9_noise_estimate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_noise_estimate.c b/vp9/encoder/vp9_noise_estimate.c index 8c0f4aec0..1341e79c4 100644 --- a/vp9/encoder/vp9_noise_estimate.c +++ b/vp9/encoder/vp9_noise_estimate.c @@ -34,7 +34,7 @@ void vp9_noise_estimate_init(NOISE_ESTIMATE *const ne, int width, int height) { } 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 @@ static int enable_noise_estimation(VP9_COMP *const cpi) { 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; |