fft3dのヘルプ等を修正。

rigaya · Jun 29, 2024 · 2c1ab77 · 2c1ab77
1 parent 15f3201
commit 2c1ab77
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/NVEnc/NVEnc_readme.txt b/NVEnc/NVEnc_readme.txt
@@ -215,6 +215,9 @@ NVIDIA グラフィックドライバ 551.23
 今後の更新で設定ファイルの互換性がなくなるかもしれません。
 
 【メモ】
+2024.06.29 (7.57)
+- --vpp-colorspace, --vpp-resize ngx-vsr, --vpp-ngx-truehdr が一部の言語のOSで正常に動作しない問題を修正。
+
 2024.06.29 (7.56)
 [NVEncC]
 - NVIDIA VSR (Video Super Resolution)によるリサイズフィルタを追加。(--vpp-resize ngx-vsr)

diff --git a/NVEncCore/rgy_cmd.cpp b/NVEncCore/rgy_cmd.cpp
@@ -2416,7 +2416,7 @@ int parse_one_vpp_option(const TCHAR *option_name, const TCHAR *strInput[], int
         }
         i++;
         const auto paramList = std::vector<std::string>{
-            "sigma", "amount", "block_size", "overlap", "overlap2", "method", "temporal", "prec" };
+            "sigma", "amount", "block_size", "overlap",/*"overlap2",*/ "method", "temporal", "prec"};
         for (const auto &param : split(strInput[i], _T(","))) {
             auto pos = param.find_first_of(_T("="));
             if (pos != std::string::npos) {
@@ -8002,16 +8002,16 @@ tstring gen_cmd_help_vpp() {
         _T("      amount=<float>        amount of denoising (default=%.2f, 0 - 1)\n")
         _T("      block_size=<int>      block size of calculation.\n")
         _T("                              8, 16, 32 (default), 64\n")
-        _T("      overlap=<float>       block overlap (default=%.2f, 0 - 0.8)\n")
-        _T("      overlap2=<float>      block overlap to be averaged (default=%.2f, 0 - 0.8)\n")
-        _T("                              overlap + overlap2 must be below 0.8.\n")
+        _T("      overlap=<float>       block overlap (default=%.2f, 0.2 - 0.8)\n")
+        //_T("      overlap2=<float>      block overlap to be averaged (default=%.2f, 0 - 0.8)\n")
+        //_T("                              overlap + overlap2 must be below 0.8.\n")
         _T("      method=<int>          method of denoising\n")
         _T("                              0 (default), 1\n")
         _T("      temporal=<int>        Enable temporal filtering (default=%d)\n")
         _T("      prec=<string>         Select calculation precision.\n")
         _T("                              auto (default), fp16, fp32\n"),
         FILTER_DEFAULT_DENOISE_FFT3D_SIGMA, FILTER_DEFAULT_DENOISE_FFT3D_AMOUNT, FILTER_DEFAULT_DENOISE_FFT3D_BLOCK_SIZE,
-        FILTER_DEFAULT_DENOISE_FFT3D_OVERLAP, FILTER_DEFAULT_DENOISE_FFT3D_OVERLAP2, FILTER_DEFAULT_DENOISE_FFT3D_TEMPORAL);
+        FILTER_DEFAULT_DENOISE_FFT3D_OVERLAP, /* FILTER_DEFAULT_DENOISE_FFT3D_OVERLAP2,*/ FILTER_DEFAULT_DENOISE_FFT3D_TEMPORAL);
 #endif
     str += strsprintf(_T("\n")
         _T("   --vpp-subburn [<param1>=<value>][,<param2>=<value>][...]\n")

diff --git a/NVEncCore/rgy_prm.cpp b/NVEncCore/rgy_prm.cpp
@@ -1091,8 +1091,8 @@ bool VppDenoiseFFT3D::operator!=(const VppDenoiseFFT3D &x) const {
 
 tstring VppDenoiseFFT3D::print() const {
     tstring str = strsprintf(_T("denoise-fft3d: sigma %.2f, strength %.2f, block_size %d\n"
-        "                         overlap %.2f:%.2f, method %d, temporal %d, precision %s"),
-        sigma, amount, block_size, overlap, overlap2, method, temporal, get_cx_desc(list_vpp_fp_prec, precision));
+        "                         overlap %.2f, method %d, temporal %d, precision %s"),
+        sigma, amount, block_size, overlap, method, temporal, get_cx_desc(list_vpp_fp_prec, precision));
     return str;
 }
 

diff --git a/NVEncCore/rgy_prm.h b/NVEncCore/rgy_prm.h
@@ -365,8 +365,8 @@ const CX_DESC list_vpp_denoise[] = {
     { _T("pmd"),     2 },
     { _T("denoise-dct"), 8 },
     { _T("smooth"),  3 },
-    { _T("convolution3d"),  5 },
     { _T("fft3d"), 10 },
+    { _T("convolution3d"),  5 },
 #if ENCODER_VCEENC
     { _T("preprocess"), 4 },
 #endif

diff --git a/NVEncCore/rgy_resource.cpp b/NVEncCore/rgy_resource.cpp
@@ -70,6 +70,7 @@ _BINARY_VPP_FILTER_FILE(rgy_filter_decimate_cl);
 _BINARY_VPP_FILTER_FILE(rgy_filter_decomb_cl);
 _BINARY_VPP_FILTER_FILE(rgy_filter_delogo_cl);
 _BINARY_VPP_FILTER_FILE(rgy_filter_denoise_dct_cl);
+_BINARY_VPP_FILTER_FILE(rgy_filter_denoise_fft3d_cl);
 _BINARY_VPP_FILTER_FILE(rgy_filter_denoise_knn_cl);
 _BINARY_VPP_FILTER_FILE(rgy_filter_denoise_nlmeans_cl);
 _BINARY_VPP_FILTER_FILE(rgy_filter_denoise_pmd_cl);
@@ -139,6 +140,7 @@ static const RGYResourceData RGY_RESOURCE_DATA[] = {
     { _T("EXE_DATA"), _T("RGY_FILTER_DECOMB_CL"), _BINARY_VPP_FILTER_FILE(rgy_filter_decomb_cl) },
     { _T("EXE_DATA"), _T("RGY_FILTER_DELOGO_CL"), _BINARY_VPP_FILTER_FILE(rgy_filter_delogo_cl) },
     { _T("EXE_DATA"), _T("RGY_FILTER_DENOISE_DCT_CL"), _BINARY_VPP_FILTER_FILE(rgy_filter_denoise_dct_cl) },
+    { _T("EXE_DATA"), _T("RGY_FILTER_DENOISE_FFT3D_CL"), _BINARY_VPP_FILTER_FILE(rgy_filter_denoise_fft3d_cl) },
     { _T("EXE_DATA"), _T("RGY_FILTER_DENOISE_KNN_CL"), _BINARY_VPP_FILTER_FILE(rgy_filter_denoise_knn_cl) },
     { _T("EXE_DATA"), _T("RGY_FILTER_DENOISE_NLMEANS_CL"), _BINARY_VPP_FILTER_FILE(rgy_filter_denoise_nlmeans_cl) },
     { _T("EXE_DATA"), _T("RGY_FILTER_DENOISE_PMD_CL"), _BINARY_VPP_FILTER_FILE(rgy_filter_denoise_pmd_cl) },

diff --git a/NVEncCore/rgy_version.h b/NVEncCore/rgy_version.h
@@ -29,9 +29,9 @@
 #ifndef __RGY_CONFIG_H__
 #define __RGY_CONFIG_H__
 
-#define VER_FILEVERSION              0,7,56,0
-#define VER_STR_FILEVERSION          "7.56"
-#define VER_STR_FILEVERSION_TCHAR _T("7.56")
+#define VER_FILEVERSION              0,7,57,0
+#define VER_STR_FILEVERSION          "7.57"
+#define VER_STR_FILEVERSION_TCHAR _T("7.57")
 
 #ifdef _M_IX86
 #define BUILD_ARCH_STR _T("x86")