commit 07ed3ab2293c1ca1acc28a8a3855d59a7d05533d
author Wei-Ting Lin <weitinglin@google.com> Mon Aug 28 17:50:25 2017 -0700
committer Wei-ting Lin <weitinglin@google.com> Thu Sep 07 14:03:04 2017 +0000
tree 9beaf71e9a137e928615a37ce03b74f9b9df878b
parent 668d3d99f8f97ab4ac80fb58e6f5176d8708426f

ncobmc-adapt-weight: add bitstream to support warped motion

Change-Id: I0e9df3719e5f9a55e1386afe44851d1707e2e01b

av1/encoder/block.h

diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 16a9b28..34f9942 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -214,6 +214,9 @@
   int motion_mode_cost[BLOCK_SIZES_ALL][MOTION_MODES];
 #if CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
   int motion_mode_cost1[BLOCK_SIZES_ALL][2];
+#if CONFIG_NCOBMC_ADAPT_WEIGHT
+  int motion_mode_cost2[BLOCK_SIZES_ALL][OBMC_FAMILY_MODES];
+#endif
 #endif  // CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
 #if CONFIG_MOTION_VAR && CONFIG_NCOBMC_ADAPT_WEIGHT
   int ncobmc_mode_cost[ADAPT_OVERLAP_BLOCKS][MAX_NCOBMC_MODES];