commit 845b203fe3ba70574d317733d92a0143223e6554
author Pascal Massimino <skal@google.com> Fri Jan 22 08:24:47 2021 +0100
committer James Zern <jzern@google.com> Mon Feb 01 21:15:27 2021 +0000
tree 623b7ddf734ae3c2a8be96e5fa898dc2f9a7dca7
parent 757be90f741b4d518c40e3eadb4d2e76b53557b3

Fix compilation for CONFIG_LPF_MASK

Change-Id: I1f6cf23fbb379b1ebece81d90825d8d18daf5008

av1/common/loopfiltermask.c

diff --git a/av1/common/loopfiltermask.c b/av1/common/loopfiltermask.c
index 157310f..1ae0b11 100644
--- a/av1/common/loopfiltermask.c
+++ b/av1/common/loopfiltermask.c
@@ -1260,11 +1260,9 @@
   const TX_SIZE tx_size_y_vert = txsize_vert_map[tx_size];
   const TX_SIZE tx_size_y_horz = txsize_horz_map[tx_size];
   const TX_SIZE tx_size_uv_vert = txsize_vert_map[av1_get_max_uv_txsize(
-      mbmi->sb_type, cm->seq_params.subsampling_x,
-      cm->seq_params.subsampling_y)];
+      mbmi->bsize, cm->seq_params.subsampling_x, cm->seq_params.subsampling_y)];
   const TX_SIZE tx_size_uv_horz = txsize_horz_map[av1_get_max_uv_txsize(
-      mbmi->sb_type, cm->seq_params.subsampling_x,
-      cm->seq_params.subsampling_y)];
+      mbmi->bsize, cm->seq_params.subsampling_x, cm->seq_params.subsampling_y)];
   const int is_square_transform_size = tx_size <= TX_64X64;
   int mask_id = 0;
   int offset = 0;
@@ -1332,11 +1330,9 @@
   const TX_SIZE tx_size_y_vert = txsize_vert_map[mbmi->tx_size];
   const TX_SIZE tx_size_y_horz = txsize_horz_map[mbmi->tx_size];
   const TX_SIZE tx_size_uv_vert = txsize_vert_map[av1_get_max_uv_txsize(
-      mbmi->sb_type, cm->seq_params.subsampling_x,
-      cm->seq_params.subsampling_y)];
+      mbmi->bsize, cm->seq_params.subsampling_x, cm->seq_params.subsampling_y)];
   const TX_SIZE tx_size_uv_horz = txsize_horz_map[av1_get_max_uv_txsize(
-      mbmi->sb_type, cm->seq_params.subsampling_x,
-      cm->seq_params.subsampling_y)];
+      mbmi->bsize, cm->seq_params.subsampling_x, cm->seq_params.subsampling_y)];
   const int is_square_transform_size = mbmi->tx_size <= TX_64X64;
   int mask_id = 0;
   int offset = 0;
@@ -1424,7 +1420,7 @@
            << vert_shift);
     }
   }
-  const int is_skip = mbmi->skip && is_inter_block(mbmi);
+  const int is_skip = is_inter_block(mbmi) && mbmi->skip_mode;
   if (is_skip) {
     const int is_skip_mask = mask_id_table_tx_4x4[bsize];
     for (int i = 0; i + index < 4; ++i) {