commit 765e34e3d944c423fccfc89c1db5eafe1bcfbd2c
author Cheng Chen <chengchen@google.com> Mon Dec 11 11:43:35 2017 -0800
committer Cheng Chen <chengchen@google.com> Tue Dec 12 17:34:29 2017 +0000
tree 493ca4b08367583039f1366e5269b92c9f581b12
parent 13c42779ed4e04ad26c77769ac8767566a0d9ac1

Make lpf_sb work with loopfilter_level

Make lpf_sb compatible with loopfilter_level, when USE_GUESS_LEVEL = 1.

Filter levels will be selected based on q index and applied for
filtering on Y, U, V planes separately.

Current model only allows to guess one filter level.
Now Y_vert = Y_horz = U = V. In the future, we need to retrain the
model and get filter levels for Y_vert, Y_horz, U and V separately.

When USE_GUESS_LEVEL = 0, lpf_sb can't work with loopfilter_level yet.

Change-Id: Icd774a147c07a4035cf8204a8754b2a99668bbfd

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 1cd667a..b2465ea 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -356,11 +356,19 @@
 
   BOUNDARY_TYPE boundary_info;
 #if CONFIG_LPF_SB
+#if CONFIG_LOOPFILTER_LEVEL
+  // 0: y plane vert, 1: y plane horz, 2: u plane, 3: v plane
+  uint8_t filt_lvl[4];
+  int reuse_sb_lvl[4];
+  int sign[4];
+  int delta[4];
+#else
   uint8_t filt_lvl;
   int reuse_sb_lvl;
   int sign;
   int delta;
-#endif
+#endif  // CONFIG_LOOPFILTER_LEVEL
+#endif  // CONFIG_LPF_SB
 
 #if CONFIG_JNT_COMP
   int compound_idx;