commit 3ab5984ebaaa3889787f5066b89beeb563cd73f9
author leolzhao <leolzhao@tencent.com> Tue May 11 10:07:48 2021 -0700
committer leolzhao <leolzhao@tencent.com> Wed May 12 14:43:32 2021 -0700
tree a5910a4645b3cf7aaf88ff820379556eba0d80f1
parent 2f25a2844519728662a4943bfca8d18a8baac3d4

Fix the decoder crash with CONFIG_SDP

The decoder crash happens when both sdp and intraBC are enabled for key frame.

In the previous code patches of SDP, variable tree_type exists in struct MB_MODE_INFO and struct MACROBLOCKD, which is easy to cause inconsistency. To solve the problem, variable tree_type from struct MB_MODE_INFO is removed in this code patch. And this variable is passed as the parameter into functions is_inter_block() and is_intrabc_block.

STATS_CHANGED

BUGS=aomedia:3052

Change-Id: I06c13c4be064ecb0d272f80af9d85a9c180cc83f

av1/encoder/encodeframe_utils.c

diff --git a/av1/encoder/encodeframe_utils.c b/av1/encoder/encodeframe_utils.c
index 430b8b6..a7efe97 100644
--- a/av1/encoder/encodeframe_utils.c
+++ b/av1/encoder/encodeframe_utils.c
@@ -180,7 +180,11 @@
     TX_SIZE min_tx_size = depth_to_tx_size(MAX_TX_DEPTH, bsize);
     mbmi->tx_size = (TX_SIZE)TXSIZEMAX(mbmi->tx_size, min_tx_size);
   }
+#if CONFIG_SDP
+  if (is_inter_block(mbmi, xd->tree_type)) {
+#else
   if (is_inter_block(mbmi)) {
+#endif
     memset(mbmi->inter_tx_size, mbmi->tx_size, sizeof(mbmi->inter_tx_size));
   }
   const int stride = xd->tx_type_map_stride;
@@ -386,7 +390,11 @@
   }
 #endif
   if (!frame_is_intra_only(cm)) {
+#if CONFIG_SDP
+    if (is_inter_block(mi_addr, xd->tree_type)) {
+#else
     if (is_inter_block(mi_addr)) {
+#endif
       // TODO(sarahparker): global motion stats need to be handled per-tile
       // to be compatible with tile-based threading.
       update_global_motion_used(mi_addr->mode, bsize, mi_addr, rdc);