Index: source/libvpx/vp8/encoder/rdopt.c |
=================================================================== |
--- source/libvpx/vp8/encoder/rdopt.c (revision 278778) |
+++ source/libvpx/vp8/encoder/rdopt.c (working copy) |
@@ -15,7 +15,6 @@ |
#include <assert.h> |
#include "vpx_config.h" |
#include "vp8_rtcd.h" |
-#include "vp8/common/pragmas.h" |
#include "tokenize.h" |
#include "treewriter.h" |
#include "onyx_int.h" |
@@ -1936,7 +1935,8 @@ |
void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, |
int recon_uvoffset, int *returnrate, |
- int *returndistortion, int *returnintra) |
+ int *returndistortion, int *returnintra, |
+ int mb_row, int mb_col) |
{ |
BLOCK *b = &x->block[0]; |
BLOCKD *d = &x->e_mbd.block[0]; |
@@ -1974,8 +1974,8 @@ |
cpi->common.y1dc_delta_q); |
#if CONFIG_TEMPORAL_DENOISING |
- unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX, |
- best_rd_sse = INT_MAX; |
+ unsigned int zero_mv_sse = UINT_MAX, best_sse = UINT_MAX, |
+ best_rd_sse = UINT_MAX; |
#endif |
mode_mv = mode_mv_sb[sign_bias]; |
@@ -2511,6 +2511,7 @@ |
#if CONFIG_TEMPORAL_DENOISING |
if (cpi->oxcf.noise_sensitivity) |
{ |
+ int block_index = mb_row * cpi->common.mb_cols + mb_col; |
if (x->best_sse_inter_mode == DC_PRED) |
{ |
/* No best MV found. */ |
@@ -2521,7 +2522,9 @@ |
best_sse = best_rd_sse; |
} |
vp8_denoiser_denoise_mb(&cpi->denoiser, x, best_sse, zero_mv_sse, |
- recon_yoffset, recon_uvoffset); |
+ recon_yoffset, recon_uvoffset, |
+ &cpi->common.lf_info, mb_row, mb_col, |
+ block_index); |
/* Reevaluate ZEROMV after denoising. */ |