Skip to content

Commit

Permalink
高ビットレートソースや低スペックPC等では動作が不安定になるため、フレームレートに上限を設けて処理をスキップする設定を行えるようにしました。
Browse files Browse the repository at this point in the history
  • Loading branch information
@YUKI-ENT
YUKI-ENT committed Nov 13, 2024
1 parent 9379302 commit 46606bc
Show file tree
Hide file tree
Showing 18 changed files with 1,922 additions and 814 deletions.
12 changes: 0 additions & 12 deletions ENTcapture.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,21 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup64", "Setup64\Setup64.
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{80367970-848C-42CE-86DC-6C07E594C0AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80367970-848C-42CE-86DC-6C07E594C0AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80367970-848C-42CE-86DC-6C07E594C0AF}.Debug|x64.ActiveCfg = Debug|x64
{80367970-848C-42CE-86DC-6C07E594C0AF}.Debug|x64.Build.0 = Debug|x64
{80367970-848C-42CE-86DC-6C07E594C0AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80367970-848C-42CE-86DC-6C07E594C0AF}.Release|Any CPU.Build.0 = Release|Any CPU
{80367970-848C-42CE-86DC-6C07E594C0AF}.Release|x64.ActiveCfg = Release|x64
{80367970-848C-42CE-86DC-6C07E594C0AF}.Release|x64.Build.0 = Release|x64
{C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Debug|Any CPU.ActiveCfg = Debug
{C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Debug|x64.ActiveCfg = Debug
{C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Debug|x64.Build.0 = Debug
{C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Release|Any CPU.ActiveCfg = Release
{C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Release|x64.ActiveCfg = Release
{C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Release|x64.Build.0 = Release
{40E878F4-3CE4-4D1F-A20E-105D53A2C4F3}.Debug|Any CPU.ActiveCfg = Debug
{40E878F4-3CE4-4D1F-A20E-105D53A2C4F3}.Debug|x64.ActiveCfg = Debug
{40E878F4-3CE4-4D1F-A20E-105D53A2C4F3}.Release|Any CPU.ActiveCfg = Release
{40E878F4-3CE4-4D1F-A20E-105D53A2C4F3}.Release|x64.ActiveCfg = Release
{FB3EB4AA-AE9A-4D5A-BAC3-81630F9E8226}.Debug|Any CPU.ActiveCfg = Debug
{FB3EB4AA-AE9A-4D5A-BAC3-81630F9E8226}.Debug|x64.ActiveCfg = Debug
{FB3EB4AA-AE9A-4D5A-BAC3-81630F9E8226}.Release|Any CPU.ActiveCfg = Release
{FB3EB4AA-AE9A-4D5A-BAC3-81630F9E8226}.Release|x64.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
Expand Down
17 changes: 10 additions & 7 deletions OpenCV_CS/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="OpenCV_CS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="OpenCV_CS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
</sectionGroup>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="ENTcapture.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="ENTcapture.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<applicationSettings>
<OpenCV_CS.Properties.Settings>
Expand Down Expand Up @@ -248,6 +248,9 @@
<setting name="FPS6" serializeAs="String">
<value>0</value>
</setting>
<setting name="maxfps" serializeAs="String">
<value>0</value>
</setting>
</ENTcapture.Properties.Settings>
</userSettings>
</configuration>
</configuration>
37 changes: 11 additions & 26 deletions OpenCV_CS/ENTcapture.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>ENTcapture</RootNamespace>
<AssemblyName>ENTcapture</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>false</Deterministic>
Expand Down Expand Up @@ -37,25 +37,7 @@
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>89AA6D9BABBAAE6672A34DE9F07E47359389ACF2</ManifestCertificateThumbprint>
Expand Down Expand Up @@ -217,6 +199,9 @@
</ItemGroup>
<ItemGroup>
<Content Include="icon.ico" />
<Content Include="openh264-1.8.0-win64.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Resources\playpause1.png" />
<None Include="Resources\playpause.png" />
<None Include="Resources\stop32.png" />
Expand Down Expand Up @@ -246,24 +231,24 @@
<Version>3.8.0</Version>
</PackageReference>
<PackageReference Include="Npgsql">
<Version>8.0.3</Version>
<Version>8.0.5</Version>
</PackageReference>
<PackageReference Include="NuGet.Build.Tasks.Pack">
<Version>6.9.1</Version>
<Version>6.11.1</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="OpenCvSharp4">
<Version>4.9.0.20240103</Version>
<Version>4.10.0.20240616</Version>
</PackageReference>
<PackageReference Include="OpenCvSharp4.Extensions">
<Version>4.9.0.20240103</Version>
<Version>4.10.0.20240616</Version>
</PackageReference>
<PackageReference Include="OpenCvSharp4.runtime.win">
<Version>4.9.0.20240103</Version>
<Version>4.10.0.20240616</Version>
</PackageReference>
<PackageReference Include="OpenCvSharp4.Windows">
<Version>4.9.0.20240103</Version>
<Version>4.10.0.20240616</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
36 changes: 29 additions & 7 deletions OpenCV_CS/Form1.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 46606bc

Please sign in to comment.