commit f18ba02100a6a21224ba2c1cd1d97f1ebee4f299
author Cheng Chen <chengchen@google.com> Wed Dec 06 10:16:27 2017 -0800
committer Cheng Chen <chengchen@google.com> Tue Dec 12 02:37:41 2017 +0000
tree 0621a8574d4f282767df2cd2a9da45d0cf908706
parent cdb8983f99378bb991a6a162bdd9058b16c8602e

LPF_SB: set row delay to work with intrabc

Intrabc search area can't use pixels of the last 8 rows in the current
superblock row. Add a delay so that lpf_sb can work with intrabc.

Let lpf_sb on with intrabc while other loop filtering off (cdef, loop
restoration).

Change-Id: I98ab093a17096387b6233182da2656f90dfa09eb

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 73db844..ba271c7 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2578,9 +2578,9 @@
 #endif  // CONFIG_LOOP_RESTORATION
 
 static void encode_loopfilter(AV1_COMMON *cm, struct aom_write_bit_buffer *wb) {
-#if CONFIG_INTRABC
+#if CONFIG_INTRABC && !CONFIG_LPF_SB
   if (cm->allow_intrabc && NO_FILTER_FOR_IBC) return;
-#endif  // CONFIG_INTRABC
+#endif  // CONFIG_INTRABC && !CONFIG_LPF_SB
   int i;
   struct loopfilter *lf = &cm->lf;