Merge branch 'aramasub/VVCSoftware_VTM-JVET-O0426-Simp-MRLRefSamplesForDC'

source/Lib/CommonLib/IntraPrediction.cpp

@@ -250,14 +250,22 @@ Pel IntraPrediction::xGetPredValDc( const CPelBuf &pSrc, const Size &dstSize )
   {
     for( idx = 0; idx < width; idx++ )
     {
+#if JVET_O0426_MRL_REF_SAMPLES_DC_MODE
+      sum += pSrc.at(m_ipaParam.multiRefIndex + 1 + idx, 0);
+#else
       sum += pSrc.at( 1 + idx, 0 );
+#endif
     }
   }
   if ( width <= height )
   {
     for( idx = 0; idx < height; idx++ )
     {
+#if JVET_O0426_MRL_REF_SAMPLES_DC_MODE
+      sum += pSrc.at(0, m_ipaParam.multiRefIndex + 1 + idx);
+#else
       sum += pSrc.at( 0, 1 + idx );
+#endif
     }
   }
 
@@ -476,7 +484,6 @@ void IntraPrediction::xPredIntraPlanar( const CPelBuf &pSrc, PelBuf &pDst )
     }
   }
 }
-
 void IntraPrediction::xPredIntraDc( const CPelBuf &pSrc, PelBuf &pDst, const ChannelType channelType, const bool enableBoundaryFilter )
 {
   const Pel dcval = xGetPredValDc( pSrc, pDst );

source/Lib/CommonLib/TypeDef.h

@@ -50,6 +50,8 @@
 #include <assert.h>
 #include <cassert>
 
+#define JVET_O0426_MRL_REF_SAMPLES_DC_MODE                1 // JVET-O0426: align MRL reference samples used for DC intra mode prediction
+
 #define JVET_O0366_AFFINE_BCW                             1 // JVET-O0366: Simplifications on BCW index derivation process
 
 #define JVET_O1168_CU_CHROMA_QP_OFFSET                    1 // JVET-O1168: cu chroma QP offset