diff options
| author | Tim Kopp <tkopp@google.com> | 2014-07-16 08:22:14 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-16 08:22:14 -0700 |
| commit | ca752e3320274621c1a2f38bafc33a2669f07bba (patch) | |
| tree | 473d8d300d57c5835a80542564dda56bbdb8a1da /vp9/encoder/vp9_pickmode.c | |
| parent | f1f3d092c2b1a5c418b313eeb484beed67e194d5 (diff) | |
| parent | 03819ed9abed8a1043947f986f327148d6bcb290 (diff) | |
| download | libvpx-ca752e3320274621c1a2f38bafc33a2669f07bba.tar libvpx-ca752e3320274621c1a2f38bafc33a2669f07bba.tar.gz libvpx-ca752e3320274621c1a2f38bafc33a2669f07bba.tar.bz2 libvpx-ca752e3320274621c1a2f38bafc33a2669f07bba.zip | |
Merge "VP9 Denoiser denoises after mode/bsize search"
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index c8d4339b0..0140fb59e 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -356,7 +356,8 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, int mi_row, int mi_col, int *returnrate, int64_t *returndistortion, - BLOCK_SIZE bsize) { + BLOCK_SIZE bsize, + PICK_MODE_CONTEXT *ctx) { MACROBLOCKD *xd = &x->e_mbd; MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi; struct macroblock_plane *const p = &x->plane[0]; @@ -408,12 +409,6 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, PRED_BUFFER *this_mode_pred = NULL; int i; -#if CONFIG_DENOISING - if (cpi->oxcf.noise_sensitivity > 0) { - vp9_denoiser_reset_frame_stats(&cpi->denoiser); - } -#endif - if (cpi->sf.reuse_inter_pred_sby) { for (i = 0; i < 3; i++) { tmp[i].data = &pred_buf[pixels_in_block * i]; @@ -609,7 +604,8 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, #if CONFIG_DENOISING if (cpi->oxcf.noise_sensitivity > 0) { - vp9_denoiser_update_frame_stats(&cpi->denoiser, mbmi, sse_y, this_mode); + vp9_denoiser_update_frame_stats(&cpi->denoiser, mbmi, sse_y, + this_mode, ctx); } #endif @@ -730,11 +726,5 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, } } -#if CONFIG_DENOISING - if (cpi->oxcf.noise_sensitivity > 0) { - vp9_denoiser_denoise(&cpi->denoiser, x, mi_row, mi_col, bsize); - } -#endif - return INT64_MAX; } |