commit 10a0380a9118d93e5d78d2796b81f031aab4b444
author RogerZhou <youzhou@microsoft.com> Thu Oct 26 11:49:48 2017 -0700
committer Roger Zhou <youzhou@microsoft.com> Fri Oct 27 00:06:15 2017 +0000
tree 510b38b48ddb4517efef207678e51d3a6a1e0c01
parent 43edb7605669c5c59b2b6c3377d4c48018918987

Fixed build conflict (amvr,intrabc).

Change-Id: Ibfeb424bf0ebab7bbeb69f6f6df24a4f4924ec97

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 9c3ac2d..765bea3 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3993,11 +3993,11 @@
     aom_wb_write_bit(wb, cm->allow_screen_content_tools);
 #if CONFIG_AMVR
     if (cm->allow_screen_content_tools) {
-      if (cm->seq_mv_precision_level == 2) {
+      if (cm->seq_force_integer_mv == 2) {
         aom_wb_write_bit(wb, 1);
       } else {
         aom_wb_write_bit(wb, 0);
-        aom_wb_write_bit(wb, cm->seq_mv_precision_level == 0);
+        aom_wb_write_bit(wb, cm->seq_force_integer_mv);
       }
     }
 #endif
@@ -4077,12 +4077,17 @@
 #endif
 
 #if CONFIG_AMVR
-      if (cm->seq_mv_precision_level == 2) {
-        aom_wb_write_bit(wb, cm->cur_frame_mv_precision_level == 0);
+      if (cm->seq_force_integer_mv == 2) {
+        aom_wb_write_bit(wb, cm->cur_frame_force_integer_mv);
       }
-#endif
+      if (cm->cur_frame_force_integer_mv) {
+        cm->allow_high_precision_mv = 0;
+      } else {
+        aom_wb_write_bit(wb, cm->allow_high_precision_mv);
+      }
+#else
       aom_wb_write_bit(wb, cm->allow_high_precision_mv);
-
+#endif
       fix_interp_filter(cm, cpi->td.counts);
       write_frame_interp_filter(cm->interp_filter, wb);
 #if CONFIG_TEMPMV_SIGNALING
@@ -4270,11 +4275,11 @@
     aom_wb_write_bit(wb, cm->allow_screen_content_tools);
 #if CONFIG_AMVR
     if (cm->allow_screen_content_tools) {
-      if (cm->seq_mv_precision_level == 2) {
+      if (cm->seq_force_integer_mv == 2) {
         aom_wb_write_bit(wb, 1);
       } else {
         aom_wb_write_bit(wb, 0);
-        aom_wb_write_bit(wb, cm->seq_mv_precision_level == 0);
+        aom_wb_write_bit(wb, cm->seq_force_integer_mv == 0);
       }
     }
 #endif
@@ -4356,8 +4361,8 @@
 #endif
 
 #if CONFIG_AMVR
-    if (cm->seq_mv_precision_level == 2) {
-      aom_wb_write_bit(wb, cm->cur_frame_mv_precision_level == 0);
+    if (cm->seq_force_integer_mv == 2) {
+      aom_wb_write_bit(wb, cm->cur_frame_force_integer_mv == 0);
     }
 #endif
     aom_wb_write_bit(wb, cm->allow_high_precision_mv);