Skip to content

F
FGOUT
Commit bf12278e by 鲁志-悦动
Options

用OpenCV将实时帧缩放到低分辨率后再缓存

parent 2dfae8ad
Showing with 79 additions and 235 deletions
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
181380438361 18560433975
1-1441241311 1470602451
11-1602666439 11-350624472
23-1982761867 24771590698
Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml; Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
True False
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Controller/Recording/NDIViewRecording.cs
using System; using log4net;
using System.Collections.Generic; using OpenCvSharp;
using System.Linq;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core;
using VIZ.Framework.Common; using VIZ.Framework.Common;
using OpenCvSharp;
using System.Windows.Controls;
using SharpDX;
using log4net;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Module/VIZ.FGOUT.Module.csproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props" Condition="Exists('..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -12,6 +13,8 @@ ...@@ -12,6 +13,8 @@
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
...@@ -409,4 +412,10 @@ ...@@ -409,4 +412,10 @@
</Page> </Page>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props'))" />
</Target>
</Project> </Project>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module.csproj.FileListAbsolute.txt
...@@ -748,3 +748,7 @@ D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\UE ...@@ -748,3 +748,7 @@ D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\UE
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\UEControlPanelView.baml D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\UEControlPanelView.baml
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\UEControlPanelView.g.cs D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\UEControlPanelView.g.cs
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\UEControlPanelView.baml D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\UEControlPanelView.baml
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\dll\x86\OpenCvSharpExtern.dll
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\dll\x86\opencv_videoio_ffmpeg480.dll
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\dll\x64\OpenCvSharpExtern.dll
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\dll\x64\opencv_videoio_ffmpeg480_64.dll
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
22-808211288 22-1559853185
4-137960189
90-747441034 90-1236168610
151697787199 151-737430311
NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml; NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;
False True
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.i.cache
...@@ -11,10 +11,10 @@ false ...@@ -11,10 +11,10 @@ false
DEBUG;TRACE DEBUG;TRACE
22-808211288 22-808211288
4414250355
91978002453 91978002453
151697787199 151697787199
NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml; NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;
True False
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.i.lref deleted 100644 → 0
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.i.cs
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDISettingView\View\AlgorithmSettingPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDISettingView\View\NDISettingPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDISettingView\View\NDISettingView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIView\View\NDIView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\AboutPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\CheckDataPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\HotkeySettingPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\MattingImagePanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\PackageSettingPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\PreviewSettingPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\ReplayPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\StyleSettingPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\SystemSettingView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\UEControlPanelView.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\UESettingPanelView.xaml;;
VIZ.FGOUT/VIZ.FGOUT.Module/packages.config
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<package id="MouseKeyHook" version="5.6.0" targetFramework="net48" /> <package id="MouseKeyHook" version="5.6.0" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" /> <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
<package id="OpenCvSharp4" version="4.6.0.20220608" targetFramework="net48" /> <package id="OpenCvSharp4" version="4.6.0.20220608" targetFramework="net48" />
<package id="OpenCvSharp4.runtime.win" version="4.8.0.20230708" targetFramework="net48" />
<package id="SharpDX" version="4.2.0" targetFramework="net48" /> <package id="SharpDX" version="4.2.0" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" /> <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
<package id="System.Memory" version="4.5.4" targetFramework="net48" /> <package id="System.Memory" version="4.5.4" targetFramework="net48" />
......
VIZ.FGOUT/VIZ.FGOUT/App.config
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup> </startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT/MainWindow.xaml.cs
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Module; using VIZ.Framework.Module;
namespace VIZ.FGOUT namespace VIZ.FGOUT
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/VIZ.FGOUT.exe.config
...@@ -6,32 +6,18 @@ ...@@ -6,32 +6,18 @@
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="LiteDB" publicKeyToken="4ee40123013c9f27" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.14.0" newVersion="5.0.14.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Memory" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="LiteDB" publicKeyToken="4ee40123013c9f27" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.0.14.0" newVersion="5.0.14.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT.csproj.FileListAbsolute.txt
...@@ -676,3 +676,7 @@ D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\obj\x64\Debug\VIZ.FGOUT.csproj.CoreCompile ...@@ -676,3 +676,7 @@ D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\obj\x64\Debug\VIZ.FGOUT.csproj.CoreCompile
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\obj\x64\Debug\VIZ.FGOUT.csproj.CopyComplete D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\obj\x64\Debug\VIZ.FGOUT.csproj.CopyComplete
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\obj\x64\Debug\VIZ.FGOUT.exe D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\obj\x64\Debug\VIZ.FGOUT.exe
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\obj\x64\Debug\VIZ.FGOUT.pdb D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\obj\x64\Debug\VIZ.FGOUT.pdb
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x86\OpenCvSharpExtern.dll
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x86\opencv_videoio_ffmpeg480.dll
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x64\OpenCvSharpExtern.dll
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\dll\x64\opencv_videoio_ffmpeg480_64.dll
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT.csproj.SuggestedBindingRedirects.cache
8b3763b1758d227b9ec02b0a123047e658f5e820 0d0a24063b8a3cc1ee4eb9f23e015744e9234cfc
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT.exe.config
...@@ -6,32 +6,18 @@ ...@@ -6,32 +6,18 @@
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="LiteDB" publicKeyToken="4ee40123013c9f27" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.14.0" newVersion="5.0.14.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Memory" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="LiteDB" publicKeyToken="4ee40123013c9f27" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-5.0.14.0" newVersion="5.0.14.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
2-1347366880 21265083526
6968741766 6-790135758
431460283494 42-431505870
CloseAlgorithmWindow.xaml;MainWindow.xaml; CloseAlgorithmWindow.xaml;MainWindow.xaml;
False True
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/Plugin/TrackingBox/TrackingBoxPlugin.cs
using OpenCvSharp; using SharpDX.Direct2D1;
using SharpDX.Direct2D1;
using SharpDX.DirectWrite; using SharpDX.DirectWrite;
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.Framework.Domain; using VIZ.Framework.Domain;
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/VideoControl.xaml.cs
...@@ -51,7 +51,7 @@ namespace VIZ.Framework.Common ...@@ -51,7 +51,7 @@ namespace VIZ.Framework.Common
/// </summary> /// </summary>
public void UpdateVideoFrame(IVideoFrame videoFrame, bool isReplay = false) public void UpdateVideoFrame(IVideoFrame videoFrame, bool isReplay = false)
{ {
this.videoRender?.UpdateVideoFrame(videoFrame, isReplay); videoRender?.UpdateVideoFrame(videoFrame, isReplay);
} }
/// <summary> /// <summary>
...@@ -59,7 +59,7 @@ namespace VIZ.Framework.Common ...@@ -59,7 +59,7 @@ namespace VIZ.Framework.Common
/// </summary> /// </summary>
public void ClearVideoFrame() public void ClearVideoFrame()
{ {
this.videoRender.UpdateVideoFrame(null); videoRender.UpdateVideoFrame(null);
} }
/// <summary> /// <summary>
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/VideoCustomRender.cs
...@@ -83,29 +83,27 @@ namespace VIZ.Framework.Common ...@@ -83,29 +83,27 @@ namespace VIZ.Framework.Common
{ {
if (videoFrame == null) if (videoFrame == null)
{ {
this.RenderInfo = null; RenderInfo = null;
return; return;
} }
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
// 计算绘制区域与大小 // 计算绘制区域与大小
ImageHelper.AdjustSize((int)this.ActualWidth, (int)this.ActualHeight, videoFrame.Width, videoFrame.Height, out int width, out int height); ImageHelper.AdjustSize((int)ActualWidth, (int)ActualHeight, videoFrame.Width, videoFrame.Height, out int width, out int height);
int x = (int)((ActualWidth - width) / 2);
int x = (int)((this.ActualWidth - width) / 2); int y = (int)((ActualHeight - height) / 2);
int y = (int)((this.ActualHeight - height) / 2);
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
// 绘制信息 // 绘制信息
VideoRenderInfo info = new VideoRenderInfo(); VideoRenderInfo info = new VideoRenderInfo();
info.Frame = videoFrame; info.Frame = videoFrame;
info.ControlRect = new Rect(0, 0, this.ActualWidth, this.ActualHeight); info.ControlRect = new Rect(0, 0, ActualWidth, ActualHeight);
info.DrawingRect = new Rect(x, y, width, height); info.DrawingRect = new Rect(x, y, width, height);
lock (this.render_lock_object) lock (render_lock_object)
{ {
if (!isReplay) if (!isReplay)
this.RenderInfo?.Dispose(); RenderInfo?.Dispose();
this.RenderInfo = info; RenderInfo = info;
} }
} }
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Recording/VideoControlRecording.cs
using OpenCvSharp; using OpenCvSharp;
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/BMDStream/BMDStreamVideoFrame.cs
using OpenCvSharp; using OpenCvSharp;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/DeckLinkStream/DeckLinkStreamVideoFrame.cs
using OpenCvSharp; using OpenCvSharp;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/NDI/NDIStreamVideoFrame.cs
using NewTek; using OpenCvSharp;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SharpDX;
using SharpDX.Direct2D1;
using SharpDX.Mathematics.Interop;
using OpenCvSharp;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/OpenCV/OpenCVStream.cs
using OpenCvSharp; using log4net;
using System; using OpenCvSharp;
using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using log4net;
using NewTek;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/OpenCV/Task/OpenCVStreamRecvVideoTask.cs
using NewTek; using log4net;
using NewTek.NDI; using OpenCvSharp;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using System.Threading; using System.Threading;
using System.Drawing;
using System.Drawing.Imaging;
using OpenCvSharp;
using System.Diagnostics;
using log4net;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/VideoFrameBase.cs
using OpenCvSharp; using OpenCvSharp;
using SharpDX; using SharpDX;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
...@@ -31,7 +27,7 @@ namespace VIZ.Framework.Common ...@@ -31,7 +27,7 @@ namespace VIZ.Framework.Common
this.DataStream = new DataStream(this.Length, true, true); this.DataStream = new DataStream(this.Length, true, true);
Mat mat = new Mat(1, 1, MatType.CV_8UC4, color); var mat = new Mat(1, 1, MatType.CV_8UC4, color);
unsafe unsafe
{ {
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/VideoStreamOptionBase.cs
using OpenCvSharp; using OpenCvSharp;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/GeneratedInternalTypeHelper.g.cs
//------------------------------------------------------------------------------ 
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}
VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/VIZ.Framework.Common_MarkupCompile.lref
 D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FD:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;; FD:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;;
FD:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;; FD:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment