commit dae377d06cb44e5683b1fb8b90d9380c93668c48
author Luc Trudeau <luc@trud.ca> Tue Apr 10 13:02:47 2018 -0400
committer Yaowu Xu <yaowu@google.com> Wed Apr 11 22:03:37 2018 +0000
tree 3737ab6751bae138d2df1af51d2815c5b4b4a6d4
parent 87f5c3415997d6974c23853b666681457c96c819

[Normative] Update CfL storage flag

Fix issue introduced in e720cce6d9134e3ea8367a64c443f5f9adc72701

BUG=aomedia:1728

Change-Id: I7d6dc3915ab0bcb4f80ad3d5367a4af78eb08b10

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 145c41a..b9cbe9c 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -178,7 +178,7 @@
                               max_scan_line, eob, cm->reduced_tx_set_used);
     }
   }
-  if (plane == AOM_PLANE_Y && xd->cfl.store_y) {
+  if (plane == AOM_PLANE_Y && store_cfl_required(cm, xd)) {
     cfl_store_tx(xd, row, col, tx_size, mbmi->sb_type);
   }
 }
@@ -504,8 +504,7 @@
         }
       }
     }
-
-    if (xd->cfl.store_y) {
+    if (store_cfl_required(cm, xd)) {
       cfl_store_block(xd, mbmi->sb_type, mbmi->tx_size);
     }
   }