commit 8587878ca2c96a6bbab7456e423a8842c5182c6c
author Hui Su <huisu@google.com> Tue Nov 07 14:56:31 2017 -0800
committer Hui Su <huisu@google.com> Thu Nov 09 19:21:49 2017 +0000
tree dead71f9808225f11cc522bfac22eec874279358
parent 8e232aad32141e4f42a9ad6024a1255e85214fb0

Add flag to indicate if intrabc is used

Change-Id: If8a4f3d256e619c9efdb66b1d8b8da5b8fc980ab

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 1340cef..d8d8e7b 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3870,6 +3870,9 @@
     aom_wb_write_literal(wb, cpi->common.ans_window_size_log2 - 8, 4);
 #endif  // CONFIG_ANS && ANS_MAX_SYMBOLS
     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) {
@@ -3881,7 +3884,13 @@
     }
 #endif
   } else {
-    if (cm->intra_only) aom_wb_write_bit(wb, cm->allow_screen_content_tools);
+    if (cm->intra_only) {
+      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_NO_FRAME_CONTEXT_SIGNALING
     if (!cm->error_resilient_mode) {
       if (cm->intra_only) {