commit 1e84af5248b4871e663fb48ce403e034fed29cdf
author Luc Trudeau <luc@trud.ca> Sat Nov 25 15:00:28 2017 -0500
committer David Michael Barr <b@rr-dav.id.au> Thu Nov 30 23:25:20 2017 +0000
tree 501e887ce9d2d041c8b385695b3c33a1075583f5
parent 88c1c3f4a54906b9ba52991c7f22eeac479785a9

[CFL] CfL Initialization Simplification

The CfL context is now stored inside MACROBLOCKD instead of
MACROBLOCKD only storing a pointer to the CfL context.
The intent is to avoid race conditions as MACROBLOCKD is stored
inside ThreadData. This change also simplifies CfL Initialization.

Change-Id: I991503716b21fc9aca60caddb2008b8bff397e6d

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 094b78d..c9d3c9e 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -111,10 +111,6 @@
 FILE *keyfile;
 #endif
 
-#if CONFIG_CFL
-CFL_CTX NULL_CFL;
-#endif
-
 #if CONFIG_INTERNAL_STATS
 typedef enum { Y, U, V, ALL } STAT_TYPE;
 #endif  // CONFIG_INTERNAL_STATS
@@ -1037,11 +1033,7 @@
 
   av1_set_mb_mi(cm, cm->width, cm->height);
   av1_init_context_buffers(cm);
-  av1_init_macroblockd(cm, xd,
-#if CONFIG_CFL
-                       &NULL_CFL,
-#endif
-                       NULL);
+  av1_init_macroblockd(cm, xd, NULL);
   memset(cpi->mbmi_ext_base, 0,
          cm->mi_rows * cm->mi_cols * sizeof(*cpi->mbmi_ext_base));
   set_tile_info(cpi);