diff --git a/models/NnlfSet1_LumaCNNFilter_IntraSlice_float.sadl b/models/NnlfSet1_LumaCNNFilter_IntraSlice_float.sadl index d8ccf59465cea4b6ae1596ebe2aecb0dd50c73a8..d5be4ad1670398adab68117f50a3804c5f739fd6 100644 Binary files a/models/NnlfSet1_LumaCNNFilter_IntraSlice_float.sadl and b/models/NnlfSet1_LumaCNNFilter_IntraSlice_float.sadl differ diff --git a/models/NnlfSet1_LumaCNNFilter_IntraSlice_int16.sadl b/models/NnlfSet1_LumaCNNFilter_IntraSlice_int16.sadl index 825b5f4c751e1f44bf322cf0616686205a521666..623f35e9a41f870d1cee8041d86245f0a5938ca2 100644 Binary files a/models/NnlfSet1_LumaCNNFilter_IntraSlice_int16.sadl and b/models/NnlfSet1_LumaCNNFilter_IntraSlice_int16.sadl differ diff --git a/source/Lib/CommonLib/NNFilterSet1.cpp b/source/Lib/CommonLib/NNFilterSet1.cpp index e45f45ab269d91e7f31ee0439b87f657ee8ecba6..03c3da2f3575133b7069d40961c56e12ff5dda4f 100644 --- a/source/Lib/CommonLib/NNFilterSet1.cpp +++ b/source/Lib/CommonLib/NNFilterSet1.cpp @@ -373,12 +373,20 @@ void NNFilterSet1::cnnFilterLumaBlock(Picture* pic, UnitArea inferArea, int extL { InputData inputRec = {NN_INPUT_REC, 0, 1024, 3, true, false}; InputData inputPred = {NN_INPUT_PRED, 1, 1024, 3, true, false}; +#if JVET_AB0053_NO_PART_NO_ATTN + InputData inputBs = {NN_INPUT_BS, 2, 1024, 3, true, false}; + InputData inputQp = {NN_INPUT_LOCAL_QP, 3, 64, 7, true, false}; +#else InputData inputPartition = {NN_INPUT_PARTITION, 2, 1024, 3, true, false}; InputData inputBs = {NN_INPUT_BS, 3, 1024, 3, true, false}; InputData inputQp = {NN_INPUT_LOCAL_QP, 4, 64, 7, true, false}; +#endif listInputData.push_back(inputRec); listInputData.push_back(inputPred); +#if JVET_AB0053_NO_PART_NO_ATTN +#else listInputData.push_back(inputPartition); +#endif listInputData.push_back(inputBs); listInputData.push_back(inputQp); } diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 4fb0ed3a2c535e2281cb302b9f21694f2aae1278..c60e0a651a9797662ffd38c273b24775aa938ca8 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -91,6 +91,7 @@ using TypeSadl = float; #if NN_FILTERING_SET_1 #define SCALE_NN_RESIDUE 1 #define FUSE_NN_AND_LF 1 +#define JVET_AB0053_NO_PART_NO_ATTN 1 #define BYPASS_INTER_SLICE 0 // only used for training data generation #endif