commit 1f69ae75f3918c5a194489e9366f2f3767281eec
author Elliott Karpilovsky <elliottk@google.com> Wed Jun 02 15:59:10 2021 -0700
committer Elliott Karpilovsky <elliottk@google.com> Wed Jun 02 15:59:10 2021 -0700
tree 6b98c5fabd156dcf8e77da316624b4d9f6f8b735
parent addd36f66f3e277a7342a7070487e17f0f30a94a

Fix bug with wedge mode and II_ML modes

Change-Id: I878bb042402cee11833ec912ef8b0ddc8042f4d6

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 623e964..a0abb9a 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -10941,7 +10941,8 @@
   const int_mv mv0 = mbmi->mv[0];
 #if CONFIG_INTERINTRA_ML
   const int is_wedge_used =
-      is_interintra_ml_supported(&x->e_mbd, /*wedge=*/false);
+      !is_interintra_ml_supported(&x->e_mbd, /*wedge=*/false) &&
+      is_interintra_wedge_used(bsize);
 #else
   const int is_wedge_used = is_interintra_wedge_used(bsize);
 #endif  // CONFIG_INTERINTRA_ML