commit a8474b61fe89406f283533329c265de6f869119c
author Luc Trudeau <luc@trud.ca> Thu Dec 07 12:13:45 2017 -0500
committer David Michael Barr <b@rr-dav.id.au> Thu Dec 07 22:41:15 2017 +0000
tree eb923bbada1e85838bd9dabc6408d036b1dd2556
parent 3889c6d89a82e57624a57e9bdc987eca373aafcc

[CFL] Don't Store Luma Pixels When CfL is not Allowed

Change-Id: I09cf970a9be3a7dfe7e134bec5d778cda77f2682

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 8b14613..fcba03c 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2142,7 +2142,7 @@
     return;
   }
 #if CONFIG_CFL
-  if (plane == AOM_PLANE_Y && xd->cfl.store_y) {
+  if (plane == AOM_PLANE_Y && xd->cfl.store_y && is_cfl_allowed(mbmi)) {
     assert(!is_inter_block(mbmi) || plane_bsize < BLOCK_8X8);
     cfl_store_tx(xd, blk_row, blk_col, tx_size, plane_bsize);
   }