diff --git a/cfg/encoder_lowdelay_P_vtm.cfg b/cfg/encoder_lowdelay_P_vtm.cfg index d763034ad9f3e9fda355a8f99aaa3f09beae6c37..bf198fee60805aaea3d2c80daa8d4a14c98e7948 100644 --- a/cfg/encoder_lowdelay_P_vtm.cfg +++ b/cfg/encoder_lowdelay_P_vtm.cfg @@ -137,7 +137,7 @@ ISPFast : 1 FastMrg : 1 AMaxBT : 1 FastMIP : 0 -FastIntraPass : 1 +FastLocalDualTree : 1 # Encoder optimization tools AffineAmvrEncOpt : 0 diff --git a/cfg/encoder_lowdelay_vtm.cfg b/cfg/encoder_lowdelay_vtm.cfg index 929106da2cadb8995bb648b50f3c1450b1420050..9c0b5c16483f09eb7b6376e322e770f19a7a9fed 100644 --- a/cfg/encoder_lowdelay_vtm.cfg +++ b/cfg/encoder_lowdelay_vtm.cfg @@ -141,7 +141,7 @@ ISPFast : 1 FastMrg : 1 AMaxBT : 1 FastMIP : 0 -FastIntraPass : 1 +FastLocalDualTree : 1 # Encoder optimization tools AffineAmvrEncOpt : 0 diff --git a/cfg/encoder_randomaccess_vtm.cfg b/cfg/encoder_randomaccess_vtm.cfg index a098b224eb3bca4106a5516f48d41f9f2171db5d..546f4ccfe74801767406d8733223c1044deacf87 100644 --- a/cfg/encoder_randomaccess_vtm.cfg +++ b/cfg/encoder_randomaccess_vtm.cfg @@ -160,7 +160,7 @@ FastMrg : 1 AMaxBT : 1 FastMIP : 0 FastLFNST : 0 -FastIntraPass : 0 +FastLocalDualTree : 0 # Encoder optimization tools AffineAmvrEncOpt : 1 diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp index 01efaf236e3b5bed5f324e40711398c87ec5047e..962e868d0786fd4e55e66fdb2a90fe0e49eb18a8 100644 --- a/source/App/EncoderApp/EncApp.cpp +++ b/source/App/EncoderApp/EncApp.cpp @@ -342,7 +342,7 @@ void EncApp::xInitLibCfg() m_cEncLib.setUseMIP ( m_MIP ); m_cEncLib.setUseFastMIP ( m_useFastMIP ); #if JVET_O0050_LOCAL_DUAL_TREE - m_cEncLib.setUseFastIntraPass ( m_useFastIntraPass ); + m_cEncLib.setUseFastLocalDualTree ( m_useFastLocalDualTree ); #endif m_cEncLib.setCrossComponentPredictionEnabledFlag ( m_crossComponentPredictionEnabledFlag ); m_cEncLib.setUseReconBasedCrossCPredictionEstimate ( m_reconBasedCrossCPredictionEstimate ); diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp index 958930df2b4096ca46d25df3c6395673ceb9dff2..69636c16accae996b030c50b69c6e0613874099f 100644 --- a/source/App/EncoderApp/EncAppCfg.cpp +++ b/source/App/EncoderApp/EncAppCfg.cpp @@ -947,7 +947,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] ) ("MIP", m_MIP, true, "Enable MIP (matrix-based intra prediction)") ("FastMIP", m_useFastMIP, false, "Fast encoder search for MIP (matrix-based intra prediction)") #if JVET_O0050_LOCAL_DUAL_TREE - ("FastIntraPass", m_useFastIntraPass, false, "Fast intra pass coding for local dual-tree in intra coding region (SCIPU)") + ("FastLocalDualTree", m_useFastLocalDualTree, false, "Fast intra pass coding for local dual-tree in intra coding region (SCIPU)") #endif // Unit definition parameters ("MaxCUWidth", m_uiMaxCUWidth, 64u) @@ -3436,7 +3436,7 @@ void EncAppCfg::xPrintParameter() #endif if( m_MIP ) msg(VERBOSE, "FastMIP:%d ", m_useFastMIP); #if JVET_O0050_LOCAL_DUAL_TREE - msg( VERBOSE, "FastIntraPass:%d ", m_useFastIntraPass ); + msg( VERBOSE, "FastLocalDualTree:%d ", m_useFastLocalDualTree ); #endif msg( VERBOSE, "NumSplitThreads:%d ", m_numSplitThreads ); diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h index 554acfc218a7c14e51a81845005b78e434db9bf1..75becbc3b0a3445af0331f4292e5a3e44a411d0b 100644 --- a/source/App/EncoderApp/EncAppCfg.h +++ b/source/App/EncoderApp/EncAppCfg.h @@ -330,7 +330,7 @@ protected: bool m_MIP; bool m_useFastMIP; #if JVET_O0050_LOCAL_DUAL_TREE - bool m_useFastIntraPass; + bool m_useFastLocalDualTree; #endif diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h index 94317ef426a70092a4b4d719e0f4b44b5c7de51d..e5dd7cc1b9706a913de1ecbc6f1897f55e5823db 100644 --- a/source/Lib/EncoderLib/EncCfg.h +++ b/source/Lib/EncoderLib/EncCfg.h @@ -335,7 +335,7 @@ protected: bool m_MIP; bool m_useFastMIP; #if JVET_O0050_LOCAL_DUAL_TREE - bool m_useFastIntraPass; + bool m_useFastLocalDualTree; #endif #if MAX_TB_SIZE_SIGNALLING uint32_t m_log2MaxTbSize; @@ -952,8 +952,8 @@ public: void setUseFastMIP ( bool b ) { m_useFastMIP = b; } bool getUseFastMIP () const { return m_useFastMIP; } #if JVET_O0050_LOCAL_DUAL_TREE - void setUseFastIntraPass ( bool b ) { m_useFastIntraPass = b; } - bool getUseFastIntraPass () const { return m_useFastIntraPass; } + void setUseFastLocalDualTree ( bool b ) { m_useFastLocalDualTree = b; } + bool getUseFastLocalDualTree () const { return m_useFastLocalDualTree; } #endif #if MAX_TB_SIZE_SIGNALLING diff --git a/source/Lib/EncoderLib/IntraSearch.cpp b/source/Lib/EncoderLib/IntraSearch.cpp index 57fee82148c80aca4400d0ab21a22e20ab45e7bd..4b2429c29b18598581d6df88dd28bd5a04ae7702 100644 --- a/source/Lib/EncoderLib/IntraSearch.cpp +++ b/source/Lib/EncoderLib/IntraSearch.cpp @@ -1087,7 +1087,7 @@ bool IntraSearch::estIntraPredLumaQT( CodingUnit &cu, Partitioner &partitioner, #if JVET_O0050_LOCAL_DUAL_TREE if( cu.isConsIntra() && !cu.slice->isIntra() && csBest->cost != MAX_DOUBLE && costInterCU != COST_UNKNOWN && mode >= 0 ) { - if( m_pcEncCfg->getUseFastIntraPass() ) + if( m_pcEncCfg->getUseFastLocalDualTree() ) { //Note: only try one intra mode, which is especially useful to reduce EncT for LDB case (around 4%) break;