From 5956a3ad90fb9cbd3961f3a58b8b28a5fd89adb5 Mon Sep 17 00:00:00 2001
From: rigaya <rigaya34589@live.jp>
Date: Sun, 18 Dec 2022 22:11:17 +0900
Subject: [PATCH] =?UTF-8?q?VCEEnc.auo=E3=81=AE=E3=83=93=E3=83=AB=E3=83=89?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VCECore/VCECore.vcxproj  |  7 ++++++-
 VCEEnc/frm/frmConfig.cpp | 12 ++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/VCECore/VCECore.vcxproj b/VCECore/VCECore.vcxproj
index 086792fb..5ecf5eeb 100644
--- a/VCECore/VCECore.vcxproj
+++ b/VCECore/VCECore.vcxproj
@@ -301,7 +301,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="vce_amf.cpp" />
+    <ClCompile Include="vce_amf.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="vce_cmd.cpp" />
     <ClCompile Include="vce_core.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
diff --git a/VCEEnc/frm/frmConfig.cpp b/VCEEnc/frm/frmConfig.cpp
index e0f549bd..047365d6 100644
--- a/VCEEnc/frm/frmConfig.cpp
+++ b/VCEEnc/frm/frmConfig.cpp
@@ -1382,8 +1382,8 @@ System::Void frmConfig::ConfToFrm(CONF_GUIEX *cnf) {
     SetNUValue(fcgNUAspectRatioX, abs(enc.par[0]));
     SetNUValue(fcgNUAspectRatioY, abs(enc.par[1]));
 
-    SetNUValue(fcgNUQPMax,               enc.nQPMax);
-    SetNUValue(fcgNUQPMin,               enc.nQPMin);
+    SetNUValue(fcgNUQPMax,               enc.nQPMax.value_or(0));
+    SetNUValue(fcgNUQPMin,               enc.nQPMin.value_or(0));
     SetNUValue(fcgNUBDeltaQP,            enc.nDeltaQPBFrame);
     SetNUValue(fcgNUBRefDeltaQP,         enc.nDeltaQPBFrameRef);
 
@@ -1391,7 +1391,7 @@ System::Void frmConfig::ConfToFrm(CONF_GUIEX *cnf) {
     SetNUValue(fcgNURefFrames,          enc.nRefFrames);
 
     fcgCBDeblock->Checked             = enc.bDeblockFilter;
-    fcgCBSkipFrame->Checked           = enc.bEnableSkipFrame;
+    fcgCBSkipFrame->Checked           = enc.enableSkipFrame.value_or(false);
     fcgCBTimerPeriodTuning->Checked   = enc.bTimerPeriodTuning;
     fcgCBVBAQ->Checked                = enc.bVBAQ;
     fcgCBFullrange->Checked           = enc.common.out_vui.colorrange == RGY_COLORRANGE_FULL;
@@ -1593,8 +1593,8 @@ System::String^ frmConfig::FrmToConf(CONF_GUIEX *cnf) {
     enc.nQPI                                    = (int)fcgNUQPI->Value;
     enc.nQPP                                    = (int)fcgNUQPP->Value;
     enc.nQPB                                    = (int)fcgNUQPB->Value;
-    enc.nQPMax                                  = (int)fcgNUQPMax->Value;
-    enc.nQPMin                                  = (int)fcgNUQPMin->Value;
+    if (fcgNUQPMax->Value > 0) enc.nQPMax       = (int)fcgNUQPMax->Value;
+    if (fcgNUQPMin->Value > 0) enc.nQPMin       = (int)fcgNUQPMin->Value;
 
     enc.nBframes                                = (int)fcgNUBframes->Value;
     enc.bBPyramid                               = fcgCBBPyramid->Checked;
@@ -1606,7 +1606,7 @@ System::String^ frmConfig::FrmToConf(CONF_GUIEX *cnf) {
     enc.nRefFrames                              = (int)fcgNURefFrames->Value;
 
     enc.bDeblockFilter                          = fcgCBDeblock->Checked;
-    enc.bEnableSkipFrame                        = fcgCBSkipFrame->Checked;
+    if (fcgCBSkipFrame->Checked) enc.enableSkipFrame = fcgCBSkipFrame->Checked;
     enc.bVBAQ                                   = fcgCBVBAQ->Checked;
     enc.common.out_vui.colorrange               = fcgCBFullrange->Checked ? RGY_COLORRANGE_FULL : RGY_COLORRANGE_UNSPECIFIED;
     enc.common.out_vui.matrix                   = (CspMatrix)list_colormatrix[fcgCXColorMatrix->SelectedIndex].value;