shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Initalize zeromv_sse and newmv_sse in vp9_pick_inter_mode"

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

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

@@ -395,7 +395,10 @@

 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,

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -605,6 +605,10 @@

   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;