--vpp-libplacebo-shaderのログ出力を改善。

rigaya · Oct 27, 2024 · 456ed18 · 456ed18
1 parent 882a196
commit 456ed18
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/NVEncCore/NVEncFilterLibplacebo.cpp b/NVEncCore/NVEncFilterLibplacebo.cpp
@@ -1921,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_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);