NGX使用時にcolorspaceでcolorprimtransfer等が適切に設定されず、コンパイルエラーになるのを修正。 ( #626 )

rigaya · Oct 12, 2024 · c7c97ee · c7c97ee
1 parent c1511a7
commit c7c97ee
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/NVEncCore/NVEncFilterLibplacebo.cpp b/NVEncCore/NVEncFilterLibplacebo.cpp
@@ -387,9 +387,9 @@ RGY_ERR NVEncFilterLibplacebo::initCommon(shared_ptr<NVEncFilterParam> pParam) {
     const auto inChromaFmt = RGY_CSP_CHROMA_FORMAT[pParam->frameIn.csp];
     VideoVUIInfo vui = prm->vui;
     if (inChromaFmt == RGY_CHROMAFMT_RGB || inChromaFmt == RGY_CHROMAFMT_RGB_PACKED) {
-        vui.setIfUnset(VideoVUIInfo().to(RGY_MATRIX_RGB).to(RGY_PRIM_BT709).to(RGY_TRANSFER_IEC61966_2_1));
+        vui.setIfUnsetUnknwonAuto(VideoVUIInfo().to(RGY_MATRIX_RGB).to(RGY_PRIM_BT709).to(RGY_TRANSFER_IEC61966_2_1));
     } else {
-        vui.setIfUnset(VideoVUIInfo().to((CspMatrix)COLOR_VALUE_AUTO_RESOLUTION).to((CspColorprim)COLOR_VALUE_AUTO_RESOLUTION).to((CspTransfer)COLOR_VALUE_AUTO_RESOLUTION));
+        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(), pParam->frameIn.height);
 
@@ -1244,9 +1244,9 @@ RGY_ERR NVEncFilterLibplaceboToneMapping::setLibplaceboParam(const NVEncFilterPa
     const auto inChromaFmt = RGY_CSP_CHROMA_FORMAT[param->frameIn.csp];
     VideoVUIInfo vuiSrc = prm->vui;
     if (inChromaFmt == RGY_CHROMAFMT_RGB || inChromaFmt == RGY_CHROMAFMT_RGB_PACKED) {
-        vuiSrc.setIfUnset(VideoVUIInfo().to(RGY_MATRIX_RGB).to(RGY_PRIM_BT709).to(RGY_TRANSFER_IEC61966_2_1));
+        vuiSrc.setIfUnsetUnknwonAuto(VideoVUIInfo().to(RGY_MATRIX_RGB).to(RGY_PRIM_BT709).to(RGY_TRANSFER_IEC61966_2_1));
     } else {
-        vuiSrc.setIfUnset(VideoVUIInfo().to((CspMatrix)COLOR_VALUE_AUTO_RESOLUTION).to((CspColorprim)COLOR_VALUE_AUTO_RESOLUTION).to((CspTransfer)COLOR_VALUE_AUTO_RESOLUTION));
+        vuiSrc.setIfUnsetUnknwonAuto(VideoVUIInfo().to((CspMatrix)COLOR_VALUE_AUTO_RESOLUTION).to((CspColorprim)COLOR_VALUE_AUTO_RESOLUTION).to((CspTransfer)COLOR_VALUE_AUTO_RESOLUTION));
     }
     vuiSrc.apply_auto(VideoVUIInfo(), param->frameIn.height);
 

diff --git a/NVEncCore/NVEncFilterNGX.cpp b/NVEncCore/NVEncFilterNGX.cpp
@@ -193,9 +193,9 @@ RGY_ERR NVEncFilterNGX::initCommon(shared_ptr<NVEncFilterParam> pParam) {
     const auto inChromaFmt = RGY_CSP_CHROMA_FORMAT[pParam->frameIn.csp];
     VideoVUIInfo vui = prm->vui;
     if (inChromaFmt == RGY_CHROMAFMT_RGB || inChromaFmt == RGY_CHROMAFMT_RGB_PACKED) {
-        vui.setIfUnset(VideoVUIInfo().to(RGY_MATRIX_RGB).to(RGY_PRIM_BT709).to(RGY_TRANSFER_IEC61966_2_1));
+        vui.setIfUnsetUnknwonAuto(VideoVUIInfo().to(RGY_MATRIX_RGB).to(RGY_PRIM_BT709).to(RGY_TRANSFER_IEC61966_2_1));
     } else {
-        vui.setIfUnset(VideoVUIInfo().to((CspMatrix)COLOR_VALUE_AUTO_RESOLUTION).to((CspColorprim)COLOR_VALUE_AUTO_RESOLUTION).to((CspTransfer)COLOR_VALUE_AUTO_RESOLUTION));
+        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(), pParam->frameIn.height);
 

diff --git a/NVEncCore/NVEncFilterTweak.cu b/NVEncCore/NVEncFilterTweak.cu
@@ -358,7 +358,7 @@ RGY_ERR NVEncFilterTweak::init(shared_ptr<NVEncFilterParam> pParam, shared_ptr<R
                 || m_convC->GetFilterParam()->frameIn.csp  != csp_rgb
                 || m_convC->GetFilterParam()->frameOut.csp != pParam->frameIn.csp) {
                 VideoVUIInfo vui = prm->vui;
-                vui.setIfUnset(VideoVUIInfo().to((CspMatrix)COLOR_VALUE_AUTO_RESOLUTION).to((CspColorprim)COLOR_VALUE_AUTO_RESOLUTION).to((CspTransfer)COLOR_VALUE_AUTO_RESOLUTION));
+                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(), pParam->frameIn.height);
 
                 {

diff --git a/NVEncCore/rgy_def.h b/NVEncCore/rgy_def.h
@@ -652,6 +652,34 @@ struct VideoVUIInfo {
         setDescriptPreset();
     }
 
+    void setIfUnsetUnknwonAuto(const VideoVUIInfo &x) {
+        const auto defaultVUI = VideoVUIInfo();
+        if (   colorprim == RGY_PRIM_UNSPECIFIED
+            || colorprim == RGY_PRIM_UNKNOWN
+            || colorprim == RGY_PRIM_AUTO) {
+            colorprim = x.colorprim;
+        }
+        if (   matrix == RGY_MATRIX_UNSPECIFIED
+            || matrix == RGY_MATRIX_AUTO) {
+            matrix = x.matrix;
+        }
+        if (   transfer == RGY_TRANSFER_UNKNOWN
+            || transfer == RGY_TRANSFER_UNSPECIFIED
+            || transfer == RGY_TRANSFER_AUTO) {
+            transfer = x.transfer;
+        }
+        if (format == defaultVUI.format) {
+            format = x.format;
+        }
+        if (colorrange == defaultVUI.colorrange) {
+            colorrange = x.colorrange;
+        }
+        if (chromaloc == defaultVUI.chromaloc) {
+            chromaloc = x.chromaloc;
+        }
+        setDescriptPreset();
+    }
+
     bool operator==(const VideoVUIInfo &x) const {
         return descriptpresent == x.descriptpresent
             && colorprim == x.colorprim