diff --git a/cfg/nn-based/HOP4.cfg b/cfg/nn-based/HOP4.cfg new file mode 100644 index 0000000000000000000000000000000000000000..6eb7ed284633d46340ea84cc5ada0124c8135b29 --- /dev/null +++ b/cfg/nn-based/HOP4.cfg @@ -0,0 +1,5 @@ +NnlfOption : 4 +NnlfModelName : models/nnlf_hop4_model_int16.sadl +CbQpOffset : 1 +CrQpOffset : 1 + diff --git a/source/Lib/CommonLib/Picture.h b/source/Lib/CommonLib/Picture.h index 427de890d9608d6966bf9697c5338e70d91f64fa..d9631c17952bda64564d590fb5f15ed04e1dfa71 100644 --- a/source/Lib/CommonLib/Picture.h +++ b/source/Lib/CommonLib/Picture.h @@ -433,6 +433,9 @@ public: m_picprm.block_size = sps.getNnlfUnifiedInferSize(inferGranularity); m_picprm.extension = sps.getNnlfUnifiedInfSizeExt(); m_picprm.prmNum = sps.getNnlfUnifiedMaxNumPrms(); +#if JVET_AH0205_AH0189_WIDE_ATTEN + if (sps.getNnlfId() == NNLFUnifiedID::HOP4) m_picprm.block_size=sps.getNnlfUnifiedInferSize(NNLF_UNIFIED_INFER_GRANULARITY_BASE); +#endif #if JVET_AG0130_UNIFIED_SR const PPS& pps = *slice.getPPS(); if(pps.getPPSId() == ENC_PPS_ID_RPR) diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 90f23174fdd9a04dd467cc04555bcdf334f288b5..e188db088638e6c5a378acfdc0ad0d586c553234 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -64,6 +64,7 @@ using TypeSadlLFUnified=int16_t; #define JVET_AH0080_TRANS_INPUT 1 // JVET-AH0080: joint LOP model with inputs transformed #define JVET_AH0096_CONTENT_ADAPTIVE_LOP 1 // JVET-AH0096: Content-adaptive loop-filter #define NN_LF_UNIFIED_ID 1 // unified the model switch using sps ID +#define JVET_AH0205_AH0189_WIDE_ATTEN 1 // JVET-AH0205: Attention for HOP + AH0189 wide activation #endif