diff --git a/cfg/encoder_lowdelay_P_vtm.cfg b/cfg/encoder_lowdelay_P_vtm.cfg index 5cdffd4d478774789d76237f1c241dedb0207419..8f7b27015adcf23387d89264c3c8d2f40d5a7500 100644 --- a/cfg/encoder_lowdelay_P_vtm.cfg +++ b/cfg/encoder_lowdelay_P_vtm.cfg @@ -133,8 +133,6 @@ AMaxBT : 1 FastMIP : 0 FastLocalDualTreeMode : 2 -NnIntraPred : 0 - # Encoder optimization tools AffineAmvrEncOpt : 0 MmvdDisNum : 6 diff --git a/cfg/encoder_lowdelay_vtm.cfg b/cfg/encoder_lowdelay_vtm.cfg index 8e79cbedacb398464ad64763f59ea5582a27381a..3abc2295cdbe5b83117b5a6088126adff7b93e6a 100644 --- a/cfg/encoder_lowdelay_vtm.cfg +++ b/cfg/encoder_lowdelay_vtm.cfg @@ -137,8 +137,6 @@ AMaxBT : 1 FastMIP : 0 FastLocalDualTreeMode : 2 -NnIntraPred : 0 - # Encoder optimization tools AffineAmvrEncOpt : 0 MmvdDisNum : 6 diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp index 3f5d257c121a6017149d44d17a9f3ad721b9552f..f2501b3db232681610c9aa2e2275088dc4a26a7f 100644 --- a/source/App/EncoderApp/EncAppCfg.cpp +++ b/source/App/EncoderApp/EncAppCfg.cpp @@ -1516,7 +1516,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] ) ("TemporalFilterFutureReference", m_gopBasedTemporalFilterFutureReference, true, "Enable referencing of future frames in the GOP based temporal filter. This is typically disabled for Low Delay configurations.") ("TemporalFilterStrengthFrame*", m_gopBasedTemporalFilterStrengths, std::map<int, double>(), "Strength for every * frame in GOP based temporal filter, where * is an integer. E.g. --TemporalFilterStrengthFrame8 0.95 will enable GOP based temporal filter at every 8th frame with strength 0.95.") #if JVET_AB0149_INTRA_PRED - ("NnIntraPred", m_nnIntraPred, true, "Enable the NN-based intra prediction.\n") + ("NnIntraPred", m_nnIntraPred, false, "Enable the NN-based intra prediction.\n") ("DescriptionPairHeightWidthPathToGraphOutput", m_descriptionPairHeightWidthPathToGraphOutput, string("4,4,graph_output_4_4_int16.sadl;4,8,graph_output_4_8_int16.sadl;4,16,graph_output_4_16_int16.sadl;4,32,graph_output_4_32_int16.sadl;8,8,graph_output_8_8_int16.sadl;8,16,graph_output_8_16_int16.sadl;16,16,graph_output_16_16_int16.sadl;"), "Description of each pair of block height and width being a map key and the path to the output graph of the prediction neural network being its string value.") ("PrefixAbsolutePathsToGraphsOutput", m_prefixAbsolutePathsToGraphsOutput, string("models/intra"), "Prefix of the absolute path to the output graph of each prediction neural network.") #if JVET_AB0149_SEARCH_PNN && JVET_AB0149_ACTIVATE_WRITER_BLOCK_STATS