Merge branch 'master' into 'master'

Fix for decoding mismatch from AJ0107

See merge request !776

source/Lib/CommonLib/IntraPrediction.cpp

@@ -2776,9 +2776,9 @@ void IntraPrediction::predIntraAng( const ComponentID compId, PelBuf &piPred, co
     m_ipaParam = m_ipaParam2;
 #if JVET_AJ0107_GPM_SHAPE_ADAPT
-    int     splitDir = g_sgpmSplitDir[pu.cu->sgpmSplitDir];
+    int     splitDir   = g_sgpmSplitDir[pu.cu->sgpmSplitDir];
 #else
-    int     splitDir = pu.cu->sgpmSplitDir;
+    int     splitDir   = pu.cu->sgpmSplitDir;
 #endif
 #if JVET_AJ0112_REGRESSION_SGPM
     if (PU::isRegressionSgpm(pu))

source/Lib/EncoderLib/EncCu.cpp

@@ -15073,8 +15073,13 @@ void EncCu::xCheckRDCostMergeGeoComb2Nx2N(CodingStructure *&tempCS, CodingStruct
         if (tmFlag0)
         {
 #if JVET_AA0058_GPM_ADAPTIVE_BLENDING
+#if JVET_AJ0107_GPM_SHAPE_ADAPT
+          m_pcInterSearch->weightedGeoBlkRounded(pu, g_gpmSplitDir[whIdx][splitDir], bldIdx, CHANNEL_TYPE_LUMA, geoCombinations[geoCombIdx], predSrcTemp0, predSrcTemp1);
+          m_pcInterSearch->weightedGeoBlkRounded(pu, g_gpmSplitDir[whIdx][splitDir], bldIdx, CHANNEL_TYPE_CHROMA, geoCombinations[geoCombIdx], predSrcTemp0, predSrcTemp1);
+#else
           m_pcInterSearch->weightedGeoBlkRounded(pu, splitDir, bldIdx, CHANNEL_TYPE_LUMA, geoCombinations[geoCombIdx], predSrcTemp0, predSrcTemp1);
           m_pcInterSearch->weightedGeoBlkRounded(pu, splitDir, bldIdx, CHANNEL_TYPE_CHROMA, geoCombinations[geoCombIdx], predSrcTemp0, predSrcTemp1);
+#endif
 #else
           m_pcInterSearch->weightedGeoBlkRounded(pu, splitDir, CHANNEL_TYPE_LUMA, geoCombinations[candidateIdx], predSrc0, predSrc1);
           m_pcInterSearch->weightedGeoBlkRounded(pu, splitDir, CHANNEL_TYPE_CHROMA, geoCombinations[candidateIdx], predSrc0, predSrc1);