diff options
| author | Marco <marpan@chromium.org> | 2015-11-01 14:40:05 -0800 |
|---|---|---|
| committer | Marco <marpan@chromium.org> | 2015-11-02 12:15:26 -0800 |
| commit | c7da053d4b6e652343cb9e6b7bd5d126ff9b8a6d (patch) | |
| tree | 86845696ff63d3e38e203974fea3073f09475bc8 /vp9/encoder/vp9_pickmode.c | |
| parent | c2f6a7df8d500ba540503d042dc1dbc519a2a873 (diff) | |
| download | libvpx-c7da053d4b6e652343cb9e6b7bd5d126ff9b8a6d.tar libvpx-c7da053d4b6e652343cb9e6b7bd5d126ff9b8a6d.tar.gz libvpx-c7da053d4b6e652343cb9e6b7bd5d126ff9b8a6d.tar.bz2 libvpx-c7da053d4b6e652343cb9e6b7bd5d126ff9b8a6d.zip | |
Move noise level estimate outside denoiser.
Source noise level estimate is also useful for
setting variance encoder parameters (variance thresholds,
qp-delta, mode selection, etc), so allow it to be used also
if denoising is not on.
Change-Id: I4fe23d47607b4e17a35287057f489c29114beed1
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index af0458391..867b435bd 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1073,12 +1073,9 @@ int set_intra_cost_penalty(const VP9_COMP *const cpi, BLOCK_SIZE bsize) { // Reduce the intra cost penalty for small blocks (<=16x16). int reduction_fac = (bsize <= BLOCK_16X16) ? ((bsize <= BLOCK_8X8) ? 4 : 2) : 0; -#if CONFIG_VP9_TEMPORAL_DENOISING - if (cpi->oxcf.noise_sensitivity > 0 && - cpi->denoiser.denoising_level == kHigh) + if (cpi->noise_estimate.enabled && cpi->noise_estimate.level == kHigh) // Don't reduce intra cost penalty if estimated noise level is high. reduction_fac = 0; -#endif return vp9_get_intra_cost_penalty( cm->base_qindex, cm->y_dc_delta_q, cm->bit_depth) >> reduction_fac; } |