Merge branch 'N0483-SBT-TPM' into 'master'

JVET-N0483: disable SBT in TPM

See merge request jvet/VVCSoftware_VTM!413

source/Lib/CommonLib/TypeDef.h

@@ -50,6 +50,8 @@
 #include <assert.h>
 #include <cassert>
 
+#define JVET_N0483_DISABLE_SBT_FOR_TPM                    1
+
 #define JVET_N0242_NON_LINEAR_ALF                         1 // enable CE5-3.2, Non-linear ALF based on clipping function
 
 #define JVET_N0449_MMVD_SIMP                              1 // Configurable number of mmvd distance entries used

source/Lib/CommonLib/Unit.cpp

@@ -338,6 +338,12 @@ const uint8_t CodingUnit::checkAllowedSbt() const
   {
     return 0;
   }
+#if JVET_N0483_DISABLE_SBT_FOR_TPM
+  if( triangle )
+  {
+    return 0;
+  }
+#endif
 
   uint8_t sbtAllowed = 0;
   int cuWidth  = lwidth();