Fix for interaction of JVET-AJ0146 and OBIC mode

OBIC mode incorrectly uses timdMode instead of timdModeSad when a neighbor CU is coded in timd-sad mode.

source/Lib/CommonLib/IntraPrediction.cpp

@@ -10946,11 +10946,14 @@ void IntraPrediction::deriveTimdMergeModes(const CPelBuf &recoBuf, const CompAre
         continue;
       }
       int numSamples = cuNeighbours[i]->lumaSize().width * cuNeighbours[i]->lumaSize().height;
+      if (cuNeighbours[i]->timd
 #if JVET_AJ0061_TIMD_MERGE
-      if (cuNeighbours[i]->timd && !cuNeighbours[i]->timdMrg)
-#else
-      if (cuNeighbours[i]->timd)
+          && !cuNeighbours[i]->timdMrg
+#endif
+#if JVET_AJ0146_TIMDSAD
+          && !cuNeighbours[i]->timdSad
 #endif
+          )
       {
         int m = MAP131TO67(cuNeighbours[i]->timdMode);
         histogram[m] += numSamples;
@@ -10966,7 +10969,7 @@ void IntraPrediction::deriveTimdMergeModes(const CPelBuf &recoBuf, const CompAre
         }
       }
 #if JVET_AJ0061_TIMD_MERGE
-      else if (cuNeighbours[i]->timd && cuNeighbours[i]->timdMrg)
+      else if (cuNeighbours[i]->timdMrg)
       {
         int m = MAP131TO67(cuNeighbours[i]->timdMrgList[cuNeighbours[i]->timdMrg - 1][0]);
         histogram[m] += numSamples;
@@ -10981,6 +10984,23 @@ void IntraPrediction::deriveTimdMergeModes(const CPelBuf &recoBuf, const CompAre
           }
         }
       }
+#endif
+#if JVET_AJ0146_TIMDSAD
+      else if (cuNeighbours[i]->timdSad)
+      {
+        int m = MAP131TO67(cuNeighbours[i]->timdModeSad);
+        histogram[m] += numSamples;
+        if (cuNeighbours[i]->timdIsBlendedSad && cuNeighbours[i]->timdFusionWeightSad[1] > 0)
+        {
+          int m = MAP131TO67(cuNeighbours[i]->timdModeSecondarySad);
+          histogram[m] += numSamples;
+          if (cuNeighbours[i]->timdFusionWeightSad[2] > 0)
+          {
+            int m = MAP131TO67(cuNeighbours[i]->timdModeNonAngSad);
+            histogram[m] += numSamples;
+          }
+        }
+      }
 #endif
       else if (cuNeighbours[i]->dimd && !cuNeighbours[i]->obicFlag)
       {