diff options
| author | Jingning Han <jingning@google.com> | 2015-01-08 10:55:03 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-08 10:55:03 -0800 |
| commit | 97dc782635bfa208b1c3b9182d800fd3abe770c5 (patch) | |
| tree | 20165f5e6f33325bd11949844100143e86fe59e0 | |
| parent | f1866a5792376710f7c2d065870381af6433fa33 (diff) | |
| parent | e42b3ee765cf11a04c312fd03d5086567f0ae838 (diff) | |
| download | libvpx-97dc782635bfa208b1c3b9182d800fd3abe770c5.tar libvpx-97dc782635bfa208b1c3b9182d800fd3abe770c5.tar.gz libvpx-97dc782635bfa208b1c3b9182d800fd3abe770c5.tar.bz2 libvpx-97dc782635bfa208b1c3b9182d800fd3abe770c5.zip | |
Merge "Initalize zeromv_sse and newmv_sse in vp9_pick_inter_mode"
| -rw-r--r-- | vp9/encoder/vp9_denoiser.c | 5 | ||||
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_denoiser.c b/vp9/encoder/vp9_denoiser.c index 1444c3782..9e037e1dd 100644 --- a/vp9/encoder/vp9_denoiser.c +++ b/vp9/encoder/vp9_denoiser.c @@ -395,7 +395,10 @@ void vp9_denoiser_update_frame_info(VP9_DENOISER *denoiser, void vp9_denoiser_reset_frame_stats(PICK_MODE_CONTEXT *ctx) { ctx->zeromv_sse = UINT_MAX; - ctx->newmv_sse = UINT_MAX; + // This should be initialized as zero since mode search stage might skip + // NEWMV mode if inferred motion vector modes provide sufficiently good + // prediction quality. + ctx->newmv_sse = 0; } void vp9_denoiser_update_frame_stats(MB_MODE_INFO *mbmi, unsigned int sse, diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 60c716008..5acfcc51d 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -605,6 +605,10 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, mbmi->interp_filter = cm->interp_filter == SWITCHABLE ? EIGHTTAP : cm->interp_filter; +#if CONFIG_VP9_TEMPORAL_DENOISING + vp9_denoiser_reset_frame_stats(ctx); +#endif + for (ref_frame = LAST_FRAME; ref_frame <= GOLDEN_FRAME; ++ref_frame) { x->pred_mv_sad[ref_frame] = INT_MAX; frame_mv[NEWMV][ref_frame].as_int = INVALID_MV; |