generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vp9: 1 pass cbr: allow noise estimation down to 360p.

Browse Source 
Also adjust some thresholds for noise level setting.

Change-Id: I7e03d7057ef2061c9447728deb9c6aff5d3da4b7
This commit is contained in:
Marco 2017-01-03 16:01:05 -08:00
parent 99c573f018
commit 768b1f7281
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vp9/encoder/vp9_encodeframe.c
View File

@ -477,8 +477,8 @@ static void set_vbp_thresholds(VP9_COMP *cpi, int64_t thresholds[], int q) {
thresholds[2] = threshold_base >> 2;
thresholds[3] = threshold_base << 2;
} else {
// Increase base variance threshold based on estimated noise level.
if (cpi->noise_estimate.enabled) {
// Increase base variance threshold based on estimated noise level.
if (cpi->noise_estimate.enabled && cm->width >= 640 && cm->height >= 480) {
NOISE_LEVEL noise_level =
vp9_noise_estimate_extract_level(&cpi->noise_estimate);
if (noise_level == kHigh)

6
vp9/encoder/vp9_noise_estimate.c
View File

@ -26,13 +26,13 @@ void vp9_noise_estimate_init(NOISE_ESTIMATE *const ne, int width, int height) {
ne->level = kLowLow;
ne->value = 0;
ne->count = 0;
ne->thresh = 90;
ne->thresh = 100;
ne->last_w = 0;
ne->last_h = 0;
if (width * height >= 1920 * 1080) {
ne->thresh = 200;
} else if (width * height >= 1280 * 720) {
ne->thresh = 130;
ne->thresh = 140;
}
ne->num_frames_estimate = 20;
}
@ -52,7 +52,7 @@ static int enable_noise_estimation(VP9_COMP *const cpi) {
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 >= 480)
cpi->common.height >= 360)
return 1;
else
return 0;