commit ad7536be4f76835edb8233fe571210639aa57f6c
author Hui Su <huisu@google.com> Wed Dec 13 15:48:11 2017 -0800
committer Hui Su <huisu@google.com> Thu Dec 14 06:09:28 2017 +0000
tree cbeb79da550ebe97f6f36a0e86771b8a273f98cc
parent b122e0170c5198e053df71c94e471e76f4722679

fix conflict between intrabc and obu

Change-Id: Ieed2451060f68fee6e67bca7d836d27bc6483c0f

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 434fea5..4350163 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -4126,8 +4126,10 @@
     write_frame_size(cm, wb);
 #endif
     write_sb_size(cm, wb);
-
     aom_wb_write_bit(wb, cm->allow_screen_content_tools);
+#if CONFIG_INTRABC
+    if (cm->allow_screen_content_tools) aom_wb_write_bit(wb, cm->allow_intrabc);
+#endif  // CONFIG_INTRABC
 #if CONFIG_AMVR
     if (cm->allow_screen_content_tools) {
       if (cm->seq_force_integer_mv == 2) {
@@ -4139,7 +4141,6 @@
     }
 #endif
   } else if (cm->frame_type == INTRA_ONLY_FRAME) {
-    if (cm->intra_only) aom_wb_write_bit(wb, cm->allow_screen_content_tools);
 #if !CONFIG_NO_FRAME_CONTEXT_SIGNALING
     if (!cm->error_resilient_mode) {
       if (cm->intra_only) {
@@ -4157,6 +4158,11 @@
 #else
       write_frame_size(cm, wb);
 #endif
+      aom_wb_write_bit(wb, cm->allow_screen_content_tools);
+#if CONFIG_INTRABC
+      if (cm->allow_screen_content_tools)
+        aom_wb_write_bit(wb, cm->allow_intrabc);
+#endif  // CONFIG_INTRABC
     }
   } else if (cm->frame_type == INTER_FRAME) {
     MV_REFERENCE_FRAME ref_frame;