commit b09b55dbfb31ee3b13958b5cacf398bfe2d71c5b
author Luc Trudeau <ltrudeau@mozilla.com> Wed Apr 26 10:06:35 2017 -0400
committer Luc Trudeau <luc@trud.ca> Mon May 15 21:36:51 2017 +0000
tree 7a4f714e6dc2615293f12b5f58801ff8cfa3ce88
parent e46382a480784f4bdab581e71137444f25a45e76

[CFL] Add support for intra in inter

Change-Id: I4d8485d2bbe5348338eb909d969a0ca4b598a6b8

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 913ac2e..eb444d7 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1907,12 +1907,23 @@
     }
 #if CONFIG_CB4X4
     if (is_chroma_reference(mi_row, mi_col, bsize, xd->plane[1].subsampling_x,
-                            xd->plane[1].subsampling_y))
+                            xd->plane[1].subsampling_y)) {
       write_intra_uv_mode(ec_ctx, mbmi->uv_mode, mode, w);
 #else  // !CONFIG_CB4X4
     write_intra_uv_mode(ec_ctx, mbmi->uv_mode, mode, w);
 #endif  // CONFIG_CB4X4
 
+#if CONFIG_CFL
+      if (mbmi->uv_mode == DC_PRED) {
+        write_cfl_alphas(ec_ctx, mbmi->skip, mbmi->cfl_alpha_idx,
+                         mbmi->cfl_alpha_signs, w);
+      }
+#endif
+
+#if CONFIG_CB4X4
+    }
+#endif
+
 #if CONFIG_EXT_INTRA
     write_intra_angle_info(xd, ec_ctx, w);
 #endif  // CONFIG_EXT_INTRA