shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix to vp9 denoiser."

--- a/vp9/encoder/vp9_denoiser.c

+++ b/vp9/encoder/vp9_denoiser.c

@@ -403,10 +403,7 @@

 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 @@

     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];