Merge "Refactor motion estimation in MOTION_VAR experiment" into nextgenv2

diff --cc av1/encoder/block.h
index 3b3f93a5971036702da0d5f5d09ba9c44b951b0b,9efd895a27c7f47597a6f204cda54ac09995c493..a75dbd1ec33ebb399eb75c2682f4e7cbd5bd1696
--- 1/av1/encoder/block.h
--- 2/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@@ -129,10 -127,12 +129,14 @@@ struct macroblock 
    int *nmvsadcost[2];
    int *nmvsadcost_hp[2];
    int **mvsadcost;
+ #if CONFIG_MOTION_VAR
+   int32_t *wsrc_buf;
+   int32_t *mask_buf;
+ #endif  // CONFIG_MOTION_VAR
  
 +#if CONFIG_PALETTE
    PALETTE_BUFFER *palette_buffer;
 +#endif  // CONFIG_PALETTE
  
    // These define limits to motion vector components to prevent them
    // from extending outside the UMV borders

diff --cc av1/encoder/rdopt.c
Simple merge