commit e9638ccfff01b932471e2c0132ab6bbfe4782a50
author Yue Chen <yuec@google.com> Mon Oct 10 12:37:54 2016 -0700
committer Yue Chen <yuec@google.com> Mon Oct 17 12:48:10 2016 -0700
tree a5fce1c6104cce4d43518205fffc646fea8f3d5c
parent a48764d05fb4e4b7fc6bec88beaac4da4240bcd1

Refactor motion estimation in MOTION_VAR experiment

To get ready for pulling AV1 to nextgenv2. Refactoring is done to
make the code structures similar, especially for the motion search
part.

Change-Id: I5d7636394408d97de55394d668540f5627827983

av1/encoder/block.h

diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 8a6e134..9efd895 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -127,6 +127,10 @@
   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
 
   PALETTE_BUFFER *palette_buffer;