diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h index 9331bf39e3d00bf517bebdb6ceb70f5d0b6f0464..ff13841496f987ff12ff06d49c6116def1ff4269 100644 --- a/source/Lib/EncoderLib/EncCfg.h +++ b/source/Lib/EncoderLib/EncCfg.h @@ -2230,7 +2230,8 @@ public: #if NN_COMMON_SPS void setUseNnlf(bool b) { m_nnlf = b; } #if NN_LF_UNIFIED_ID - void setUseNnlfId(NNLFUnifiedID ui) { m_nnlfId = ui; } + void setUseNnlfId(NNLFUnifiedID ui) { m_nnlfId = ui; } + NNLFUnifiedID getUseNnlfId() const { return m_nnlfId; } #else void setUseNnlfSet(uint32_t ui) { m_nnlfSet = ui; } #endif diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp index 8c0cf22028ee759101fa2f4a2f0571bcf99c030d..9c4deebbdf9971d4624b0fdf483ff8a8fb61f701 100644 --- a/source/Lib/EncoderLib/EncGOP.cpp +++ b/source/Lib/EncoderLib/EncGOP.cpp @@ -255,6 +255,9 @@ void EncGOP::init ( EncLib* pcEncLib ) #if NN_LF_UNIFIED if (m_pcCfg->getUseNnlfUnified()) { +#if NN_LF_UNIFIED_ID + m_nnfilterUnified.nnlfTransInput(m_pcCfg->getUseNnlfId()==NNLFUnifiedID::LOP3); +#endif m_nnfilterUnified.init(m_pcCfg->getNnModel(NnModel::LOP_UNIFIED_FILTER), m_pcCfg->getSourceWidth(), m_pcCfg->getSourceHeight(), m_pcCfg->getChromaFormatIdc(), m_pcCfg->getNnlfUnifiedMaxNumPrms()); } #if NN_HOP_UNIFIED_TEMPORAL_FILTERING