commit 81d4175d87d69bd06ffc9f18598892e9f8427a18
author Onur Guleryuz <oguleryuz@google.com> Wed Apr 12 02:02:33 2023 +0000
committer Leo (Liang) Zhao <leolzhao@tencent.com> Wed Apr 12 02:02:33 2023 +0000
tree 26c309f76fa036db212b34e1a034dc4078a0107f
parent ae397e6243e76b1875e26752765da2cc2e182030

Disable offending asserts when loop filtering is off.

Fixes #144

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index bf75996..3162806 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2596,7 +2596,8 @@
     write_tokens_b(cpi, w, tok, tok_end);
   }
 #if CONFIG_PC_WIENER
-  else {
+  else if (!is_global_intrabc_allowed(cm) && !cm->features.coded_lossless) {
+    // Assert only when LR is enabled.
     assert(1 == av1_get_txk_skip(cm, xd->mi_row, xd->mi_col, 0, 0, 0));
   }
 #endif  // CONFIG_PC_WIENER

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index fa29c53..dc2353e 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -702,8 +702,11 @@
   const TX_SIZE txs_ctx = get_txsize_entropy_ctx(tx_size);
   FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
 #if CONFIG_PC_WIENER
-  assert((eob == 0) ==
-         av1_get_txk_skip(cm, xd->mi_row, xd->mi_col, plane, blk_row, blk_col));
+  if (!is_global_intrabc_allowed(cm) && !cm->features.coded_lossless) {
+    // Assert only when LR is enabled.
+    assert((eob == 0) == av1_get_txk_skip(cm, xd->mi_row, xd->mi_col, plane,
+                                          blk_row, blk_col));
+  }
 #endif  // CONFIG_PC_WIENER
   if (eob == 0) return;