NVEnc.auoのビルドを修正。

rigaya · Feb 12, 2025 · 375b4f3 · 375b4f3
1 parent 965e005
commit 375b4f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/NVEnc/encode/auo_video.cpp b/NVEnc/encode/auo_video.cpp
@@ -97,16 +97,16 @@ void get_csp_and_bitdepth(bool& use_highbit, RGY_CSP& csp, const CONF_GUIEX *con
     parse_cmd(&enc_prm, codec_prm, conf->enc.cmd);
     enc_prm.encConfig.encodeCodecConfig = codec_prm[enc_prm.codec_rgy];
     if (enc_prm.lossless) {
-        enc_prm.yuv444 = true;
+        enc_prm.outputCsp = RGY_CSP_YUV444;
     }
     use_highbit = enc_prm.outputDepth > 8;
-    if (enc_prm.rgb) {
+    if (RGY_CSP_CHROMA_FORMAT[enc_prm.outputCsp] == RGY_CHROMAFMT_RGB || RGY_CSP_CHROMA_FORMAT[enc_prm.outputCsp] == RGY_CHROMAFMT_RGB_PACKED) {
         csp = RGY_CSP_RGB;
     } else {
         if (use_highbit) {
-            csp = (enc_prm.yuv444) ? RGY_CSP_YUV444_16 : RGY_CSP_P010;
+            csp = (RGY_CSP_CHROMA_FORMAT[enc_prm.outputCsp] == RGY_CHROMAFMT_YUV444) ? RGY_CSP_YUV444_16 : RGY_CSP_P010;
         } else {
-            csp = (enc_prm.yuv444) ? RGY_CSP_YUV444 : RGY_CSP_NV12;
+            csp = (RGY_CSP_CHROMA_FORMAT[enc_prm.outputCsp] == RGY_CHROMAFMT_YUV444) ? RGY_CSP_YUV444 : RGY_CSP_NV12;
         }
     }
 }

diff --git a/NVEnc/frm/frmConfig.cpp b/NVEnc/frm/frmConfig.cpp
@@ -1453,14 +1453,7 @@ System::Void frmConfig::ConfToFrm(CONF_GUIEX *cnf) {
     fcgCBPerfMonitor->Checked = 0 != encPrm.ctrl.perfMonitorSelect;
     fcgCBLossless->Checked = 0 != encPrm.lossless;
     SetCXIndex(fcgCXOutBitDepth, get_cx_index(list_bitdepth, encPrm.outputDepth));
-
-    RGY_CSP outputCsp = RGY_CSP_YV12;
-    if (encPrm.rgb) {
-        outputCsp = RGY_CSP_RGB;
-    } else if (encPrm.yuv444) {
-        outputCsp = RGY_CSP_YUV444;
-    }
-    SetCXIndex(fcgCXOutputCsp, get_cx_index(list_output_csp, outputCsp));
+    SetCXIndex(fcgCXOutputCsp, get_cx_index(list_output_csp, encPrm.outputCsp));
 
     //QPDetail
     fcgCBQPMin->Checked = encPrm.qpMin.enable;
@@ -1738,8 +1731,7 @@ System::String^ frmConfig::FrmToConf(CONF_GUIEX *cnf) {
     encPrm.preset = list_nvenc_preset_names_ver10[fcgCXQualityPreset->SelectedIndex].value;
     encPrm.multipass = (NV_ENC_MULTI_PASS)list_nvenc_multipass_mode[fcgCXMultiPass->SelectedIndex].value;
     encPrm.brefMode = list_bref_mode[fcgCXBrefMode->SelectedIndex].value;
-    encPrm.yuv444 = list_output_csp[fcgCXOutputCsp->SelectedIndex].value == RGY_CSP_YUV444 || list_output_csp[fcgCXOutputCsp->SelectedIndex].value == RGY_CSP_RGB;
-    encPrm.rgb = list_output_csp[fcgCXOutputCsp->SelectedIndex].value == RGY_CSP_RGB;
+    encPrm.outputCsp = (RGY_CSP)list_output_csp[fcgCXOutputCsp->SelectedIndex].value;
 
     int nLookaheadDepth = (int)fcgNULookaheadDepth->Value;
     if (nLookaheadDepth > 0) {