commit 1f77147065ca1f945570c201f7ce73b55ac26ce4
author Debargha Mukherjee <debargha@google.com> Mon Mar 26 19:29:30 2018 -0700
committer Yue Chen <yuec@google.com> Tue Mar 27 03:49:38 2018 +0000
tree 9b91c10169cab00475a1535a5665001372afd948
parent f2e5bb37ef013d63cf783452affb69c30dd6b7e6

[NORMATIVE] Add seq level enable_warped_motion

This was missed in rebases.

BUG=aomedia:1656

Change-Id: Ib72f9d0d9619fac7dbd7191289ce48f55a9e6b4e

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 80a312a..3e0afdc 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2311,6 +2311,7 @@
 
   seq_params->enable_interintra_compound = aom_rb_read_bit(rb);
   seq_params->enable_masked_compound = aom_rb_read_bit(rb);
+  seq_params->enable_warped_motion = aom_rb_read_bit(rb);
 
   seq_params->enable_dual_filter = aom_rb_read_bit(rb);
 

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 4002c1f..4228e21 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2759,7 +2759,7 @@
 
   aom_wb_write_bit(wb, seq_params->enable_interintra_compound);
   aom_wb_write_bit(wb, seq_params->enable_masked_compound);
-
+  aom_wb_write_bit(wb, seq_params->enable_warped_motion);
   aom_wb_write_bit(wb, seq_params->enable_dual_filter);
 
   aom_wb_write_bit(wb, seq_params->enable_order_hint);