diff --git a/cfg/encoder_intra_vtm.cfg b/cfg/encoder_intra_vtm.cfg index 4509605d9beee1255c1699fac1f2cb88cc040b26..6f0f2f5988579b5ce23a73f17054296baa269ab7 100644 --- a/cfg/encoder_intra_vtm.cfg +++ b/cfg/encoder_intra_vtm.cfg @@ -108,6 +108,11 @@ AMaxBT : 1 FastMIP : 1 FastLFNST : 1 +NnIntraPred : 0 +NnlfOption : 0 +NnsrOption : 0 +Nnpf : 0 + # Encoder optimization tools AffineAmvrEncOpt : 0 ALFStrength : 1.0 diff --git a/cfg/encoder_lowdelay_P_vtm.cfg b/cfg/encoder_lowdelay_P_vtm.cfg index 8f7b27015adcf23387d89264c3c8d2f40d5a7500..6a9f76d629372484895f0fd1aa3cf387c1ce89dd 100644 --- a/cfg/encoder_lowdelay_P_vtm.cfg +++ b/cfg/encoder_lowdelay_P_vtm.cfg @@ -133,6 +133,11 @@ AMaxBT : 1 FastMIP : 0 FastLocalDualTreeMode : 2 +NnIntraPred : 0 +NnlfOption : 0 +NnsrOption : 0 +Nnpf : 0 + # Encoder optimization tools AffineAmvrEncOpt : 0 MmvdDisNum : 6 diff --git a/cfg/encoder_lowdelay_vtm.cfg b/cfg/encoder_lowdelay_vtm.cfg index 3abc2295cdbe5b83117b5a6088126adff7b93e6a..db326ad30ce76126567864849c12519a814837fa 100644 --- a/cfg/encoder_lowdelay_vtm.cfg +++ b/cfg/encoder_lowdelay_vtm.cfg @@ -137,6 +137,11 @@ AMaxBT : 1 FastMIP : 0 FastLocalDualTreeMode : 2 +NnIntraPred : 0 +NnlfOption : 0 +NnsrOption : 0 +Nnpf : 0 + # Encoder optimization tools AffineAmvrEncOpt : 0 MmvdDisNum : 6 diff --git a/cfg/encoder_randomaccess_vtm.cfg b/cfg/encoder_randomaccess_vtm.cfg index 6ccc2eea16ce21910e5a91a675b683c68b58c0f2..67ee764356ad920d40b54d855ae2e2a40cd51a96 100644 --- a/cfg/encoder_randomaccess_vtm.cfg +++ b/cfg/encoder_randomaccess_vtm.cfg @@ -163,6 +163,11 @@ FastLFNST : 0 FastLocalDualTreeMode : 1 ChromaTS : 1 +NnIntraPred : 0 +NnlfOption : 0 +NnsrOption : 0 +Nnpf : 0 + # Encoder optimization tools AffineAmvrEncOpt : 1 MmvdDisNum : 6 diff --git a/cfg/encoder_randomaccess_vtm_gop16.cfg b/cfg/encoder_randomaccess_vtm_gop16.cfg index d6cac06710f629a016de480d3638ed44b0ba1801..fd8d6a34b8f264baf5fa292a1c9e0cdaa98a6b84 100644 --- a/cfg/encoder_randomaccess_vtm_gop16.cfg +++ b/cfg/encoder_randomaccess_vtm_gop16.cfg @@ -147,6 +147,11 @@ FastLFNST : 0 FastLocalDualTreeMode : 1 ChromaTS : 1 +NnIntraPred : 0 +NnlfOption : 0 +NnsrOption : 0 +Nnpf : 0 + # Encoder optimization tools AffineAmvrEncOpt : 1 MmvdDisNum : 6 diff --git a/cfg/anchor_ee/encoder_intra_vtm.cfg b/cfg/nn-based/encoder_intra_nnvc.cfg similarity index 97% rename from cfg/anchor_ee/encoder_intra_vtm.cfg rename to cfg/nn-based/encoder_intra_nnvc.cfg index 6f0f2f5988579b5ce23a73f17054296baa269ab7..6a45576721d0e4838acf718592dbcb0d716c31b3 100644 --- a/cfg/anchor_ee/encoder_intra_vtm.cfg +++ b/cfg/nn-based/encoder_intra_nnvc.cfg @@ -108,10 +108,7 @@ AMaxBT : 1 FastMIP : 1 FastLFNST : 1 -NnIntraPred : 0 -NnlfOption : 0 -NnsrOption : 0 -Nnpf : 0 +NnIntraPred : 1 # Encoder optimization tools AffineAmvrEncOpt : 0 diff --git a/cfg/anchor_ee/encoder_lowdelay_P_vtm.cfg b/cfg/nn-based/encoder_lowdelay_P_nnvc.cfg similarity index 98% rename from cfg/anchor_ee/encoder_lowdelay_P_vtm.cfg rename to cfg/nn-based/encoder_lowdelay_P_nnvc.cfg index 6a9f76d629372484895f0fd1aa3cf387c1ce89dd..5cdffd4d478774789d76237f1c241dedb0207419 100644 --- a/cfg/anchor_ee/encoder_lowdelay_P_vtm.cfg +++ b/cfg/nn-based/encoder_lowdelay_P_nnvc.cfg @@ -134,9 +134,6 @@ FastMIP : 0 FastLocalDualTreeMode : 2 NnIntraPred : 0 -NnlfOption : 0 -NnsrOption : 0 -Nnpf : 0 # Encoder optimization tools AffineAmvrEncOpt : 0 diff --git a/cfg/anchor_ee/encoder_lowdelay_vtm.cfg b/cfg/nn-based/encoder_lowdelay_nnvc.cfg similarity index 99% rename from cfg/anchor_ee/encoder_lowdelay_vtm.cfg rename to cfg/nn-based/encoder_lowdelay_nnvc.cfg index db326ad30ce76126567864849c12519a814837fa..8e79cbedacb398464ad64763f59ea5582a27381a 100644 --- a/cfg/anchor_ee/encoder_lowdelay_vtm.cfg +++ b/cfg/nn-based/encoder_lowdelay_nnvc.cfg @@ -138,9 +138,6 @@ FastMIP : 0 FastLocalDualTreeMode : 2 NnIntraPred : 0 -NnlfOption : 0 -NnsrOption : 0 -Nnpf : 0 # Encoder optimization tools AffineAmvrEncOpt : 0 diff --git a/cfg/anchor_ee/encoder_randomaccess_vtm.cfg b/cfg/nn-based/encoder_randomaccess_nnvc.cfg similarity index 99% rename from cfg/anchor_ee/encoder_randomaccess_vtm.cfg rename to cfg/nn-based/encoder_randomaccess_nnvc.cfg index 67ee764356ad920d40b54d855ae2e2a40cd51a96..566eff4aee46d25cc627e6403cd88152996e804d 100644 --- a/cfg/anchor_ee/encoder_randomaccess_vtm.cfg +++ b/cfg/nn-based/encoder_randomaccess_nnvc.cfg @@ -163,10 +163,7 @@ FastLFNST : 0 FastLocalDualTreeMode : 1 ChromaTS : 1 -NnIntraPred : 0 -NnlfOption : 0 -NnsrOption : 0 -Nnpf : 0 +NnIntraPred : 1 # Encoder optimization tools AffineAmvrEncOpt : 1 diff --git a/cfg/anchor_ee/encoder_randomaccess_vtm_gop16.cfg b/cfg/nn-based/encoder_randomaccess_nnvc_gop16.cfg similarity index 98% rename from cfg/anchor_ee/encoder_randomaccess_vtm_gop16.cfg rename to cfg/nn-based/encoder_randomaccess_nnvc_gop16.cfg index fd8d6a34b8f264baf5fa292a1c9e0cdaa98a6b84..114b19e3122a1203f3015bcaeccd9c5c37dcc7f2 100644 --- a/cfg/anchor_ee/encoder_randomaccess_vtm_gop16.cfg +++ b/cfg/nn-based/encoder_randomaccess_nnvc_gop16.cfg @@ -147,10 +147,7 @@ FastLFNST : 0 FastLocalDualTreeMode : 1 ChromaTS : 1 -NnIntraPred : 0 -NnlfOption : 0 -NnsrOption : 0 -Nnpf : 0 +NnIntraPred : 1 # Encoder optimization tools AffineAmvrEncOpt : 1 diff --git a/cfg/nn-based/nnsr.cfg b/cfg/nn-based/nnsr.cfg new file mode 100644 index 0000000000000000000000000000000000000000..6bb31b81cf38e5277582a52e2fc459deec38f2d2 --- /dev/null +++ b/cfg/nn-based/nnsr.cfg @@ -0,0 +1 @@ +NnsrOption : 1