Added 'FastMIP' encoder config parameter, removed condition on intra period...

Added 'FastMIP' encoder config parameter, removed condition on intra period and picture height in IntraSearch.cpp.

cfg/encoder_intra_vtm.cfg

@@ -110,12 +110,14 @@ IBC                          : 0      # turned off in CTC
 AllowDisFracMMVD             : 1
 AffineAmvr                   : 0
 LumaReshapeEnable            : 1      # luma reshaping. 0: disable 1:enable 
+MIP                          : 1
 
 # Fast tools
 PBIntraFast                  : 1
 ISPFast                      : 1
 FastMrg                      : 1
 AMaxBT                       : 1
+FastMIP                      : 1
 
 # Encoder optimization tools
 AffineAmvrEncOpt             : 0

cfg/encoder_lowdelay_P_vtm.cfg

@@ -127,12 +127,14 @@ IBC                          : 0      # turned off in CTC
 AllowDisFracMMVD             : 1
 AffineAmvr                   : 0
 LumaReshapeEnable            : 1      # luma reshaping. 0: disable 1:enable 
+MIP                          : 1
 
 # Fast tools
 PBIntraFast                  : 1
 ISPFast                      : 1
 FastMrg                      : 1
 AMaxBT                       : 1
+FastMIP                      : 0
 
 # Encoder optimization tools
 AffineAmvrEncOpt             : 0

cfg/encoder_lowdelay_vtm.cfg

@@ -131,12 +131,14 @@ IBC                          : 0      # turned off in CTC
 AllowDisFracMMVD             : 1
 AffineAmvr                   : 0
 LumaReshapeEnable            : 1      # luma reshaping. 0: disable 1:enable 
+MIP                          : 1
 
 # Fast tools
 PBIntraFast                  : 1
 ISPFast                      : 1
 FastMrg                      : 1
 AMaxBT                       : 1
+FastMIP                      : 0
 
 # Encoder optimization tools
 AffineAmvrEncOpt             : 0

cfg/encoder_randomaccess_vtm.cfg

@@ -146,6 +146,7 @@ IBC                          : 0      # turned off in CTC
 AllowDisFracMMVD             : 1
 AffineAmvr                   : 1
 LumaReshapeEnable            : 1      # luma reshaping. 0: disable 1:enable 
+MIP                          : 1
 DMVR                         : 1
 SMVD                         : 1
 
@@ -154,6 +155,7 @@ PBIntraFast                  : 1
 ISPFast                      : 1
 FastMrg                      : 1
 AMaxBT                       : 1
+FastMIP                      : 0
 
 # Encoder optimization tools
 AffineAmvrEncOpt             : 1

source/App/EncoderApp/EncApp.cpp

@@ -333,6 +333,7 @@ void EncApp::xInitLibCfg()
 #endif
 #if JVET_N0217_MATRIX_INTRAPRED
   m_cEncLib.setUseMIP                                            ( m_MIP );
+  m_cEncLib.setUseFastMIP                                        ( m_useFastMIP );
 #endif
   m_cEncLib.setCrossComponentPredictionEnabledFlag               ( m_crossComponentPredictionEnabledFlag );
   m_cEncLib.setUseReconBasedCrossCPredictionEstimate             ( m_reconBasedCrossCPredictionEstimate );

source/App/EncoderApp/EncAppCfg.cpp

@@ -917,6 +917,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
 #endif
 #if JVET_N0217_MATRIX_INTRAPRED
   ("MIP",                                             m_MIP,                                             true,  "Enable MIP (matrix-based intra prediction)")
+  ("FastMIP",                                         m_useFastMIP,                                     false,  "Fast encoder search for MIP (matrix-based intra prediction)")
 #endif
   // Unit definition parameters
   ("MaxCUWidth",                                      m_uiMaxCUWidth,                                     64u)
@@ -3244,6 +3245,9 @@ void EncAppCfg::xPrintParameter()
   msg( VERBOSE, "UseNonLinearALFLuma:%d ", m_useNonLinearAlfLuma );
   msg( VERBOSE, "UseNonLinearALFChroma:%d ", m_useNonLinearAlfChroma );
 #endif
+#if JVET_N0217_MATRIX_INTRAPRED
+  if( m_MIP ) msg(VERBOSE, "FastMIP:%d ", m_useFastMIP);
+#endif
 
   msg( VERBOSE, "NumSplitThreads:%d ", m_numSplitThreads );
   if( m_numSplitThreads > 1 )

source/App/EncoderApp/EncAppCfg.h

@@ -314,6 +314,7 @@ protected:
 #endif
 #if JVET_N0217_MATRIX_INTRAPRED
   bool      m_MIP;
+  bool      m_useFastMIP;
 #endif
 
 

source/Lib/EncoderLib/EncCfg.h

@@ -281,6 +281,7 @@ protected:
 #endif
 #if JVET_N0217_MATRIX_INTRAPRED
   bool      m_MIP;
+  bool      m_useFastMIP;
 #endif
 
 #if MAX_TB_SIZE_SIGNALLING
@@ -866,6 +867,8 @@ public:
 #if JVET_N0217_MATRIX_INTRAPRED
   void      setUseMIP                       ( bool b )       { m_MIP = b; }
   bool      getUseMIP                       () const         { return m_MIP; }
+  void      setUseFastMIP                   ( bool b )       { m_useFastMIP = b; }
+  bool      getUseFastMIP                   () const         { return m_useFastMIP; }
 #endif
 
 #if MAX_TB_SIZE_SIGNALLING