commit aa94baa96004635f85ccac0fbe4177954f23a29b
author Luc Trudeau <ltrudeau@mozilla.com> Thu Apr 27 10:52:21 2017 -0400
committer David Michael Barr <b@rr-dav.id.au> Sat Apr 29 15:03:42 2017 +0000
tree be2a9ad30070156f75d82b2bd5ff480109d91436
parent baeb37581fa36d3e73bcb70929b8446a5a85e01e

[CFL] Adds missing call to cfl_store in RDO

A call to cfl_store is now required in the RDO code.

Change-Id: Ieabaa579a5f7e5c52ae02d0550af832b6e417878

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index c1f8cc7..65eb88e 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1556,6 +1556,15 @@
                    tx_size, &this_rd_stats.dist, &this_rd_stats.sse,
                    OUTPUT_HAS_PREDICTED_PIXELS);
   }
+#if CONFIG_CFL
+  if (plane == AOM_PLANE_Y && x->cfl_store_y) {
+    struct macroblockd_plane *const pd = &xd->plane[plane];
+    const int dst_stride = pd->dst.stride;
+    uint8_t *dst =
+        &pd->dst.buf[(blk_row * dst_stride + blk_col) << tx_size_wide_log2[0]];
+    cfl_store(xd->cfl, dst, dst_stride, blk_row, blk_col, tx_size);
+  }
+#endif
   rd = RDCOST(x->rdmult, x->rddiv, 0, this_rd_stats.dist);
   if (args->this_rd + rd > args->best_rd) {
     args->exit_early = 1;