Merge branch 'master' into patch-1

rigaya · Oct 27, 2024 · a360e50 · a360e50
2 parents 8a103f9 + 456ed18
commit a360e50
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 13 deletions.
diff --git a/NVEnc/NVEnc_readme.txt b/NVEnc/NVEnc_readme.txt
@@ -215,10 +215,15 @@ NVIDIA グラフィックドライバ 551.23
 今後の更新で設定ファイルの互換性がなくなるかもしれません。
 
 【メモ】
+2024.10.27 (7.72)
+[NVEncC]
+- --vpp-libplacebo-shaderでlumaに対して処理を行うshaderが正常に動作しなかった問題を修正。
+- --vpp-libplacebo-shaderのcolorsytem, transferを入力ファイルの情報に基づき自動的に設定するように。
+- --dhdr10-infoが動作しなくなっていたのを修正。
+
 2024.10.26 (7.71)
 [NVEncC]
 - Linuxでのlibplaceboフィルタの使用に対応。(配布バイナリではUbuntu 24.04のみ対応)
-- libplaceboによるバンディング低減フィルタを追加。(--vpp-libplacebo-deband)
 - libplaceboのcustom shaderを使用したフィルタを追加。 (--vpp-libplacebo-shader)
 - --vpp-libplacebo-tonemappingのhelpを修正。
 

diff --git a/NVEncC_Options.en.md b/NVEncC_Options.en.md
@@ -2565,13 +2565,13 @@ Apply custom shaders in the specified path using [libplacebo](https://code.video
       Output resolution of the filter.
 
     - colorsystem=&lt;string&gt;  
-      Color system to use. Default: bt709.
+      Color system to use. Default: auto detect.
       ```
       unknown, bt601, bt709, smpte240m, bt2020nc, bt2020c, bt2100pq, bt2100hlg, dolbyvision, ycgco, rgb, xyz
       ```
 
     - transfer=&lt;string&gt;  
-      Output transfer function. 
+      Output transfer function. Default: auto detect.
       ```
       unknown, srgb, bt1886, linear,
       gamma18, gamma20, gamma22, gamma24, gamma26, gamma28,

diff --git a/NVEncC_Options.ja.md b/NVEncC_Options.ja.md
@@ -2623,13 +2623,13 @@ nppc64_10.dll, nppif64_10.dll, nppig64_10.dllをNVEncC64と同じフォルダに
       フィルタの出力解像度。
 
     - colorsystem=&lt;string&gt;  
-      使用する色空間を指定。デフォルトはbt709。
+      使用する色空間を指定。デフォルトでは入力ファイルから自動的に設定される。
       ```
       unknown, bt601, bt709, smpte240m, bt2020nc, bt2020c, bt2100pq, bt2100hlg, dolbyvision, ycgco, rgb, xyz
       ```
 
     - transfer=&lt;string&gt;  
-      出力のトランスファ関数を指定。
+      出力のトランスファ関数を指定。デフォルトでは入力ファイルから自動的に設定される。
       ```
       unknown, srgb, bt1886, linear,
       gamma18, gamma20, gamma22, gamma24, gamma26, gamma28,

diff --git a/NVEncCore/NVEncFilterLibplacebo.cpp b/NVEncCore/NVEncFilterLibplacebo.cpp
@@ -1799,11 +1799,43 @@ RGY_ERR NVEncFilterLibplaceboShader::setLibplaceboParam(const NVEncFilterParam *
         return RGY_ERR_UNKNOWN;
     }
 
-    const auto vuiIn = prm->vui;
+    const auto inChromaFmt = RGY_CSP_CHROMA_FORMAT[param->frameIn.csp];
+    auto vui = prm->vui;
+    if (inChromaFmt == RGY_CHROMAFMT_RGB || inChromaFmt == RGY_CHROMAFMT_RGB_PACKED) {
+        vui.setIfUnsetUnknwonAuto(VideoVUIInfo().to(RGY_MATRIX_RGB).to(RGY_PRIM_BT709).to(RGY_TRANSFER_IEC61966_2_1));
+    } else {
+        vui.setIfUnsetUnknwonAuto(VideoVUIInfo().to((CspMatrix)COLOR_VALUE_AUTO_RESOLUTION).to((CspColorprim)COLOR_VALUE_AUTO_RESOLUTION).to((CspTransfer)COLOR_VALUE_AUTO_RESOLUTION));
+    }
+    vui.apply_auto(VideoVUIInfo(), param->frameIn.height);
 
     m_colorsystem = (pl_color_system)prm->shader.colorsystem;
+    if (m_colorsystem == PL_COLOR_SYSTEM_UNKNOWN) {
+        switch (vui.matrix) {
+        case RGY_MATRIX_RGB: m_colorsystem = PL_COLOR_SYSTEM_RGB; break;
+        case RGY_MATRIX_YCGCO: m_colorsystem = PL_COLOR_SYSTEM_YCGCO; break;
+        case RGY_MATRIX_BT470_BG:
+        case RGY_MATRIX_ST170_M: m_colorsystem = PL_COLOR_SYSTEM_BT_601; break;
+        case RGY_MATRIX_BT2020_CL: m_colorsystem = PL_COLOR_SYSTEM_BT_2020_C; break;
+        case RGY_MATRIX_BT2020_NCL: {
+            m_colorsystem = PL_COLOR_SYSTEM_BT_2020_NC;
+            if (vui.transfer == RGY_TRANSFER_ST2084) {
+                m_colorsystem = PL_COLOR_SYSTEM_BT_2100_PQ; break;
+            } else if (vui.transfer == RGY_TRANSFER_ARIB_B67) {
+                m_colorsystem = PL_COLOR_SYSTEM_BT_2100_HLG; break;
+            }
+            break;
+        }
+        case RGY_MATRIX_BT709:
+        default:
+            m_colorsystem = PL_COLOR_SYSTEM_BT_709; break;
+        }
+    }
+
     m_transfer = (pl_color_transfer)(prm->shader.transfer);
-    m_range = (vuiIn.colorrange == RGY_COLORRANGE_FULL) ? PL_COLOR_LEVELS_FULL : PL_COLOR_LEVELS_LIMITED;
+    if (m_transfer == PL_COLOR_TRC_UNKNOWN) {
+        m_transfer = transfer_rgy_to_libplacebo(vui.transfer);
+    }
+    m_range = (vui.colorrange == RGY_COLORRANGE_FULL) ? PL_COLOR_LEVELS_FULL : PL_COLOR_LEVELS_LIMITED;
     m_linear = prm->shader.linear;
     m_chromaloc = chromaloc_rgy_to_libplacebo(prm->shader.chromaloc);
 
@@ -1889,6 +1921,17 @@ RGY_ERR NVEncFilterLibplaceboShader::procFrame(pl_tex texOut[RGY_MAX_PLANES], co
     return RGY_ERR_NONE;
 }
 
+tstring NVEncFilterLibplaceboShader::printParams(const NVEncFilterParamLibplacebo *param) const {
+    auto prm = dynamic_cast<const NVEncFilterParamLibplaceboShader*>(param);
+    if (!prm) {
+        return param->print();
+    }
+    NVEncFilterParamLibplaceboShader current = *prm;
+    current.shader.colorsystem = (VppLibplaceboColorsystem)m_colorsystem;
+    current.shader.transfer = (VppLibplaceboToneMappingTransfer)m_transfer;
+    return current.print();
+}
+
 #else
 
 NVEncFilterLibplaceboResample::NVEncFilterLibplaceboResample() : NVEncFilterDisabled() { m_name = _T("libplacebo-resample"); }

diff --git a/NVEncCore/NVEncFilterLibplacebo.h b/NVEncCore/NVEncFilterLibplacebo.h
@@ -248,6 +248,7 @@ class NVEncFilterLibplaceboShader : public NVEncFilterLibplacebo {
 
     virtual RGY_CSP getTextureCsp(const RGY_CSP csp) override;
     virtual CUDAInteropDataFormat getTextureDataFormat([[maybe_unused]] const RGY_CSP csp) override;
+    virtual tstring printParams(const NVEncFilterParamLibplacebo *prm) const override;
 
     std::unique_ptr<pl_hook, RGYLibplaceboDeleter<const pl_hook*>> m_shader;
     pl_color_system m_colorsystem;

diff --git a/NVEncCore/rgy_cmd.cpp b/NVEncCore/rgy_cmd.cpp
@@ -9159,7 +9159,7 @@ tstring gen_cmd_help_vpp() {
         ) + print_list(list_vpp_libplacebo_colorsystem) + _T("\n");
     str += strsprintf(_T("")
         _T("      transfer=<string>         Output transfer function.\n")
-        _T("                                  default: %s\n"), get_cx_desc(list_vpp_libplacebo_tone_mapping_transfer, FILTER_DEFAULT_LIBPLACEBO_SHADER_TRANSFER)
+        _T("                                  default: auto detect\n")
         ) + print_list(list_vpp_libplacebo_tone_mapping_transfer) + _T("\n");
     str += strsprintf(_T("")
         _T("      resampler=<string>         Filter function to use when resample is required.\n")

diff --git a/NVEncCore/rgy_libplacebo.cpp b/NVEncCore/rgy_libplacebo.cpp
@@ -58,6 +58,7 @@ RGYLibplaceboLoader::RGYLibplaceboLoader() :
     m_pl_vulkan_release_ex(nullptr),
     m_pl_vulkan_wrap(nullptr),
 #endif
+    m_pl_gpu_finish(nullptr),
     m_pl_tex_destroy(nullptr),
     m_pl_tex_recreate(nullptr),
     m_pl_log_create(nullptr),
@@ -136,6 +137,8 @@ bool RGYLibplaceboLoader::load() {
     if (!loadFunc("pl_tex_destroy", (void**)&m_pl_tex_destroy)) return false;
     if (!loadFunc("pl_tex_recreate", (void**)&m_pl_tex_recreate)) return false;
 
+    if (!loadFunc("pl_gpu_finish", (void**)&m_pl_gpu_finish)) return false;
+
     char pl_log_create_str[256] = { 0 };
     sprintf_s(pl_log_create_str, "pl_log_create_%d", PL_API_VER);
     loadFunc(pl_log_create_str, (void**)&m_pl_log_create);

diff --git a/NVEncCore/rgy_libplacebo.h b/NVEncCore/rgy_libplacebo.h
@@ -84,6 +84,8 @@ class RGYLibplaceboLoader {
     decltype(&pl_tex_destroy) m_pl_tex_destroy;
     decltype(&pl_tex_recreate) m_pl_tex_recreate;
 
+    decltype(&pl_gpu_finish) m_pl_gpu_finish;
+
     decltype(&pl_log_create) m_pl_log_create;
     decltype(&pl_log_destroy) m_pl_log_destroy;
 
@@ -151,6 +153,7 @@ class RGYLibplaceboLoader {
 #endif
     auto p_tex_destroy() const { return m_pl_tex_destroy; }
     auto p_tex_recreate() const { return m_pl_tex_recreate; }
+    auto p_gpu_finish() const { return m_pl_gpu_finish; }
     auto p_log_create() const { return m_pl_log_create; }
     auto p_log_destroy() const { return m_pl_log_destroy; }
     auto p_dispatch_create() const { return m_pl_dispatch_create; }

diff --git a/NVEncCore/rgy_output.cpp b/NVEncCore/rgy_output.cpp
@@ -1224,7 +1224,7 @@ RGY_ERR initWriters(
         writerPrm.chapterNoTrim           = common->chapterNoTrim;
         writerPrm.attachments             = common->attachmentSource;
         writerPrm.hdrMetadataIn           = hdrMetadataIn;
-        writerPrm.hdr10plusMetadataCopy   = common->hdr10plusMetadataCopy;
+        writerPrm.hdr10plusMetadataCopy   = common->hdr10plusMetadataCopy || common->dynamicHdr10plusJson.length() > 0;
         writerPrm.doviRpu                 = doviRpu;
         writerPrm.doviRpuMetadataCopy     = common->doviRpuMetadataCopy;
         writerPrm.doviProfile             = common->doviProfile;

diff --git a/NVEncCore/rgy_prm.cpp b/NVEncCore/rgy_prm.cpp
@@ -640,7 +640,7 @@ tstring VppLibplaceboShader::print() const {
     str += strsprintf(_T("resampler=%s, "), get_cx_desc(list_vpp_resize, (int)resize_algo));
     str += strsprintf(_T("colorsystem=%s, "), get_cx_desc(list_vpp_libplacebo_colorsystem, (int)colorsystem));
     str += strsprintf(_T("transfer=%s, "), get_cx_desc(list_vpp_libplacebo_tone_mapping_transfer, (int)transfer));
-    str += strsprintf(_T("chromaloc=%s, "), get_cx_desc(list_chromaloc_str, (int)chromaloc));
+    //str += strsprintf(_T("chromaloc=%s, "), get_cx_desc(list_chromaloc_str, (int)chromaloc));
     str += strsprintf(_T("radius=%.2f, "), radius);
     str += strsprintf(_T("clamp=%.2f, "), clamp_);
     str += strsprintf(_T("taper=%.2f, "), taper);

diff --git a/NVEncCore/rgy_prm.h b/NVEncCore/rgy_prm.h
@@ -1147,6 +1147,7 @@ enum class VppLibplaceboColorsystem {
 };
 
 const CX_DESC list_vpp_libplacebo_colorsystem[] = {
+    { _T("auto"),        (int)VppLibplaceboColorsystem::UNKNOWN },
     { _T("unknown"),     (int)VppLibplaceboColorsystem::UNKNOWN },
     { _T("bt601"),       (int)VppLibplaceboColorsystem::BT_601 },
     { _T("bt709"),       (int)VppLibplaceboColorsystem::BT_709 },

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,71,0
-#define VER_STR_FILEVERSION          "7.71"
-#define VER_STR_FILEVERSION_TCHAR _T("7.71")
+#define VER_FILEVERSION             0,7,72,0
+#define VER_STR_FILEVERSION          "7.72"
+#define VER_STR_FILEVERSION_TCHAR _T("7.72")
 
 #ifdef _M_IX86
 #define BUILD_ARCH_STR _T("x86")

diff --git a/NVEncCore/rgy_vulkan.cpp b/NVEncCore/rgy_vulkan.cpp
@@ -81,6 +81,8 @@ RGYVulkanFuncs::RGYVulkanFuncs() :
     vkWaitForFences(nullptr),
     vkCreateSemaphore(nullptr),
     vkDestroySemaphore(nullptr),
+    vkWaitSemaphores(nullptr),
+    vkSignalSemaphore(nullptr),
     vkCreateEvent(nullptr),
     vkDestroyEvent(nullptr),
     vkGetEventStatus(nullptr),
@@ -270,6 +272,8 @@ int RGYVulkanFuncs::init() {
     LOAD(vkWaitForFences);
     LOAD(vkCreateSemaphore);
     LOAD(vkDestroySemaphore);
+    LOAD(vkWaitSemaphores);
+    LOAD(vkSignalSemaphore);
     LOAD(vkCreateEvent);
     LOAD(vkDestroyEvent);
     LOAD(vkGetEventStatus);

diff --git a/NVEncCore/rgy_vulkan.h b/NVEncCore/rgy_vulkan.h
@@ -100,6 +100,8 @@ class RGYVulkanFuncs {
     PFN_vkWaitForFences                                     vkWaitForFences;
     PFN_vkCreateSemaphore                                   vkCreateSemaphore;
     PFN_vkDestroySemaphore                                  vkDestroySemaphore;
+    PFN_vkWaitSemaphores                                    vkWaitSemaphores;
+    PFN_vkSignalSemaphore                                   vkSignalSemaphore;
     PFN_vkCreateEvent                                       vkCreateEvent;
     PFN_vkDestroyEvent                                      vkDestroyEvent;
     PFN_vkGetEventStatus                                    vkGetEventStatus;