summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco <marpan@google.com>2015-01-29 09:10:30 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2015-01-29 09:10:30 -0800
commita80dd52b6ea410ff20835bd12220dd77934f011a (patch)
tree95a66d426b12e2395489369ad4f829a2d3e4ddc1
parentff99a3c750bc4eecf3b6b276023b2dbca59d1d6c (diff)
parentc0923d4d3aa61cb0a4ad7a4143ef3f06e15b4f2a (diff)
downloadlibvpx-a80dd52b6ea410ff20835bd12220dd77934f011a.tar
libvpx-a80dd52b6ea410ff20835bd12220dd77934f011a.tar.gz
libvpx-a80dd52b6ea410ff20835bd12220dd77934f011a.tar.bz2
libvpx-a80dd52b6ea410ff20835bd12220dd77934f011a.zip
Merge "Fix to vp9 denoiser."
-rw-r--r--vp9/encoder/vp9_denoiser.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_denoiser.c b/vp9/encoder/vp9_denoiser.c
index 7d4e26aaf..4f245e249 100644
--- a/vp9/encoder/vp9_denoiser.c
+++ b/vp9/encoder/vp9_denoiser.c
@@ -403,10 +403,7 @@ void vp9_denoiser_update_frame_info(VP9_DENOISER *denoiser,
void vp9_denoiser_reset_frame_stats(PICK_MODE_CONTEXT *ctx) {
ctx->zeromv_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;
+ ctx->newmv_sse = UINT_MAX;
}
void vp9_denoiser_update_frame_stats(MB_MODE_INFO *mbmi, unsigned int sse,
@@ -418,7 +415,7 @@ void vp9_denoiser_update_frame_stats(MB_MODE_INFO *mbmi, unsigned int sse,
ctx->best_zeromv_reference_frame = mbmi->ref_frame[0];
}
- if (mode == NEWMV) {
+ if (mbmi->mv[0].as_int != 0 && sse < ctx->newmv_sse) {
ctx->newmv_sse = sse;
ctx->best_sse_inter_mode = mode;
ctx->best_sse_mv = mbmi->mv[0];