commit 3926f9ae196fa462b716c04aae8ebe0b329c0132
author Debargha Mukherjee <debargha@google.com> Tue Dec 01 20:07:33 2020 -0800
committer Debargha Mukherjee <debargha@google.com> Tue Dec 01 20:28:05 2020 -0800
tree 14b15cfec954f11c5fe24a22f066c39acf879e47
parent 2f804945cac8207467635c22f3ef117ed65e6b01

Remove dual filter from inspect correctly

Change-Id: Ia996df8d93e9d2755140c1fb44cd12fb72ecc1cf

av1/common/enums.h

diff --git a/av1/common/enums.h b/av1/common/enums.h
index e1e2314..7b6bb76 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -267,7 +267,6 @@
   DCT_ADST_TX_MASK = 0x000F,  // Either DCT or ADST in each direction
 } UENUM1BYTE(TX_TYPE);
 
-#if !CONFIG_REMOVE_DUAL_FILTER
 enum {
   REG_REG,
   REG_SMOOTH,
@@ -279,7 +278,6 @@
   SHARP_SMOOTH,
   SHARP_SHARP,
 } UENUM1BYTE(DUAL_FILTER_TYPE);
-#endif  // !CONFIG_REMOVE_DUAL_FILTER
 
 enum {
   // DCT only

av1/decoder/inspection.c

diff --git a/av1/decoder/inspection.c b/av1/decoder/inspection.c
index ad5dba1..05f920a 100644
--- a/av1/decoder/inspection.c
+++ b/av1/decoder/inspection.c
@@ -102,8 +102,13 @@
       mi->sb_type = mbmi->sb_type;
       // Skip Flag
       mi->skip = mbmi->skip_txfm;
+#if CONFIG_REMOVE_DUAL_FILTER
+      mi->filter[0] = mbmi->interp_fltr;
+      mi->filter[1] = mbmi->interp_fltr;
+#else
       mi->filter[0] = av1_extract_interp_filter(mbmi->interp_filters, 0);
       mi->filter[1] = av1_extract_interp_filter(mbmi->interp_filters, 1);
+#endif  // CONFIG_REMOVE_DUAL_FILTER
       mi->dual_filter_type = mi->filter[0] * 3 + mi->filter[1];
 
       // Transform