JVET-P0418: MLRP Line Idx

  - Align MLRP with CCLM in terms of reference lines/columns.

source/Lib/CommonLib/CommonDef.h

@@ -223,7 +223,11 @@ static const int RVM_VCEGAM10_M =                                   4;
 
 static const int MAX_REF_LINE_IDX =                                 3; //highest refLine offset in the list
 static const int MRL_NUM_REF_LINES =                                3; //number of candidates in the array
+#if JVET_P0418_ALIGN_MLRP_CCLM
+static const int MULTI_REF_LINE_IDX[4] =               { 0, 1, 2, 0 };
+#else
 static const int MULTI_REF_LINE_IDX[4] =               { 0, 1, 3, 0 };
+#endif
 
 static const int PRED_REG_MIN_WIDTH =                               4;  // Minimum prediction region width for ISP subblocks
 

source/Lib/CommonLib/TypeDef.h

@@ -50,6 +50,8 @@
 #include <assert.h>
 #include <cassert>
 
+#define JVET_P0418_ALIGN_MLRP_CCLM                        1 // JVET-P0418: Align MLRP with CCLM in terms of reference lines/columns
+
 #define JVET_O0145_ENTRYPOINT_SIGNALLING                  0 // JVET-O0145: Not signalling num_entry_point_offsets but derive it at decoder
 
 #define JVET_O0625_ALF_PADDING                            1 // JVET-O0625/O0654/O0662: Unified padding method in ALF