From: Yue Chen <yuec@google.com>
Date: Tue, 18 Oct 2016 00:32:00 +0000 (+0000)
Subject: Merge "Refactor motion estimation in MOTION_VAR experiment" into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fcf53e38123b6dadf08937b2c4d712add242d8c;p=libvpx

Merge "Refactor motion estimation in MOTION_VAR experiment" into nextgenv2
---

3fcf53e38123b6dadf08937b2c4d712add242d8c
diff --cc av1/encoder/block.h
index 3b3f93a59,9efd895a2..a75dbd1ec
--- a/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