Fixed Weird Frame Rate Bug

GlitcherOG · Jul 25, 2022 · 526143f · 526143f
1 parent 9e42f50
commit 526143f
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 20 deletions.
diff --git a/CameraTest/Capture Display.csproj b/CameraTest/Capture Display.csproj
@@ -50,7 +50,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>BEAA974CE65F12677E83AFEDE29E3A6F37C226E5</ManifestCertificateThumbprint>
@@ -92,6 +92,27 @@
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accord, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
       <HintPath>..\packages\Accord.3.8.0\lib\net462\Accord.dll</HintPath>
@@ -343,7 +364,6 @@
   <ItemGroup>
     <Content Include="capture-icon-2.ico" />
     <Content Include="capture-icon-2.jpg" />
-    <Content Include="License-LGPL.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Fody.6.6.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.6.0\build\Fody.targets')" />

diff --git a/CameraTest/MainWindow.Designer.cs b/CameraTest/MainWindow.Designer.cs
diff --git a/CameraTest/MainWindow.cs b/CameraTest/MainWindow.cs
@@ -152,8 +152,6 @@ public void InitalizeCamera()
                 captureDevice.SignalToStop();
                 captureDevice.WaitForStop();
                 captureDevice.NewFrame -= CaptureDevice_NewFrame;
-                pictureBox1.Image = null;
-                pictureBox2.Image = null;
             }
             if(videoSourcePlayer1.VideoSource!=null)
             {
@@ -174,7 +172,7 @@ public void InitalizeCamera()
                         pictureBox1.Visible = true;
                         pictureBox2.Visible = false;
                     }
-                    else
+                    else if(settings.RenderMode == 2)
                     {
                         pictureBox1.Visible = false;
                         pictureBox2.Visible = true;
@@ -193,7 +191,7 @@ public void InitalizeCamera()
                 captureDevice.Start();
                 for (int i = 0; i < captureDevice.VideoCapabilities.Length; i++)
                 {
-                    RenderSizeComboBox.Items.Add(captureDevice.VideoCapabilities[i].FrameSize.Width.ToString() + " x " + captureDevice.VideoCapabilities[i].FrameSize.Height.ToString() + " @" + captureDevice.VideoCapabilities[i].MaximumFrameRate);
+                    RenderSizeComboBox.Items.Add(captureDevice.VideoCapabilities[i].FrameSize.Width.ToString() + " x " + captureDevice.VideoCapabilities[i].FrameSize.Height.ToString() + " @" + captureDevice.VideoCapabilities[i].AverageFrameRate);
                 }
                 if (RenderSizeComboBox.Items.Count > 0)
                 {
@@ -205,7 +203,6 @@ public void InitalizeCamera()
                     {
                         RenderSizeComboBox.SelectedIndex = 0;
                     }
-                    UpdateDisplayMode();
                 }
             }
         }
@@ -229,9 +226,10 @@ private void CaptureDevice_NewFrame(object sender, NewFrameEventArgs eventArgs)
                 {
                     if (settings.RenderMode == 1)
                     {
-                        pictureBox1.Image = (Bitmap)eventArgs.Frame.Clone();
+                        Bitmap bitmap = (Bitmap)eventArgs.Frame.Clone();
+                        pictureBox1.Image = bitmap;
                     }
-                    else
+                    else if(settings.RenderMode == 2)
                     {
                         pictureBox2.Image = (Bitmap)eventArgs.Frame.Clone();
                     }
@@ -326,20 +324,20 @@ private void Wave_DataAvailable(object sender, WaveInEventArgs e)
         #region Display/Scale Options
         private void RenderSizeComboBox_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (captureDevice != null)
+            if (RenderSizeComboBox.SelectedIndex != -1)
             {
-                var tempFPS = FPSCount;
-                FPSCount = false;
-                captureDevice.SignalToStop();
-                captureDevice.WaitForStop();
-                if (RenderSizeComboBox.SelectedIndex != -1)
+                if (captureDevice != null)
                 {
+                    var tempFPS = FPSCount;
+                    FPSCount = false;
+                    captureDevice.SignalToStop();
+                    captureDevice.WaitForStop();
                     captureDevice.VideoResolution = captureDevice.VideoCapabilities[RenderSizeComboBox.SelectedIndex];
+                    UpdateDisplayMode();
+                    captureDevice.Start();
+                    FPSCount = tempFPS;
+                    SetSettings();
                 }
-                UpdateDisplayMode();
-                captureDevice.Start();
-                FPSCount = tempFPS;
-                SetSettings();
             }
         }
 
@@ -477,12 +475,17 @@ void SizeObjectsScale()
                 videoSourcePlayer1.Location = new Point((ClientSize.Width - videoSourcePlayer1.ClientSize.Width) / 2, (ClientSize.Height - videoSourcePlayer1.ClientSize.Height) / 2);
             }
             change = true;
+            AutoSize = false;
             pictureBox1.Location = videoSourcePlayer1.Location;
             pictureBox1.Size = videoSourcePlayer1.Size;
             pictureBox1.Dock = videoSourcePlayer1.Dock;
             pictureBox2.Location = videoSourcePlayer1.Location;
             pictureBox2.Size = videoSourcePlayer1.Size;
             pictureBox2.Dock = videoSourcePlayer1.Dock;
+            if (DisplaySizeComboBox.SelectedIndex == 0)
+            {
+                AutoSize = true;
+            }
             change = false;
         }
 
@@ -496,7 +499,7 @@ private void toolStripComboBox1_SelectedIndexChanged(object sender, EventArgs e)
         {
             if(RenderModeComboBox.SelectedIndex!=-1)
             {
-                    settings.RenderMode = RenderModeComboBox.SelectedIndex;
+                settings.RenderMode = RenderModeComboBox.SelectedIndex;
                 SetSettings();
                 InitalizeCamera();
             }
@@ -572,5 +575,6 @@ private void MainWindow_MouseEnter(object sender, EventArgs e)
                 UpdateDisplayMode();
             }
         }
+
     }
 }
diff --git a/Capture Display.sln b/Capture Display.sln
@@ -9,18 +9,24 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Debug|x64.ActiveCfg = Debug|x64
 		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Debug|x64.Build.0 = Debug|x64
+		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Debug|x86.ActiveCfg = Debug|x86
+		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Debug|x86.Build.0 = Debug|x86
 		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Release|Any CPU.Build.0 = Release|Any CPU
 		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Release|x64.ActiveCfg = Release|x64
 		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Release|x64.Build.0 = Release|x64
+		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Release|x86.ActiveCfg = Release|x86
+		{396464B0-BAD1-424F-8326-4DB1348D2A19}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE