Skip to content

F
FGOUT
Commit f12ac498 by 鲁志-悦动
Options

接收视频流OpenCV Resize处理

parent afcbe060
Showing with 382 additions and 189 deletions
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/Button/Button_Setting.xaml
......@@ -188,8 +188,11 @@
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="#378CFF" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<!--<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="Gray" />
</Trigger>-->
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="#378CFF" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
181380438361
1-1441241311
11-1602666439
23-1982761867
18560433975
1470602451
11-350624472
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;
True
False
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -171,7 +171,7 @@
<WrapPanel
Grid.Row="3"
Grid.Column="2"
Margin="135,0,0,0">
Margin="90,0,0,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
......@@ -214,7 +214,7 @@
<WrapPanel
Grid.Row="3"
Grid.Column="0"
Margin="0,0,40,0"
Margin="0,0,80,0"
HorizontalAlignment="Right">
<Grid>
<Grid.RowDefinitions>
......@@ -383,6 +383,7 @@
Height="50"
Margin="0,150,0,0"
HorizontalAlignment="Center"
Command="{Binding RestartCommand}"
Content="算法重启"
FontSize="24"
Style="{StaticResource BigButtonStyle}" />
......@@ -391,6 +392,7 @@
Height="50"
Margin="0,50,0,0"
HorizontalAlignment="Center"
Command="{Binding StopCommand}"
Content="算法关闭"
FontSize="24"
Style="{StaticResource BigButtonStyle}" />
......@@ -399,6 +401,7 @@
Height="50"
Margin="0,50,0,0"
HorizontalAlignment="Center"
Command="{Binding VideoSettingCommand}"
Content="视频配置"
FontSize="24"
Style="{StaticResource BigButtonStyle}" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -76,6 +76,12 @@ namespace VIZ.FGOUT.Module
this.UEControlCommand = new VCommand(this.UEControl);
//ReplaySend
this.ReplaySendCommand = new VCommand(this.ReplaySend);
//算法重启
this.RestartCommand = new VCommand(this.Restart);
//算法关闭
this.StopCommand= new VCommand(this.Stop);
//视频设置
this.VideoSettingCommand = new VCommand(this.VideoSetting);
}
/// <summary>
......@@ -444,6 +450,57 @@ namespace VIZ.FGOUT.Module
#endregion
#region Replay功能
public VCommand ReplayCommand { get; set; }
//private bool _replayButtonIsEnable = true;
/// <summary>
/// replay 播控功能
/// </summary>
private void Replay()
{
//if (_replayButtonIsEnable)
// ReplayEnable = _replayButtonIsEnable = false;
//else
// ReplayEnable = _replayButtonIsEnable = true;
//ReplayModel replayModel = new ReplayModel() { IsReplay = !_replayButtonIsEnable };
//ApplicationDomainEx.MessageManager.Send(replayModel);
}
public VCommand SliderValueChangedCommand { get; set; }
private int _initialValue = 150;
private void SliderValueChanged()
{
if (_initialValue != SliderValue)
{
_initialValue = SliderValue;
ReplayModel replayModel = new ReplayModel() { IsReplay = true, IsSliderValueChanged = true, SliderValue = SliderValue };
ApplicationDomain.MessageManager.Send(replayModel);
}
}
public VCommand ReplayCheckedCommand { get; set; }
public VCommand ReplayUncheckedCommand { get; set; }
private void ReplayChecked()
{
ReplaySendVisibility = Visibility.Visible;
SliderVisibility = Visibility.Visible;
SliderValue = SliderMaxValue;
ReplayModel replayModel = new ReplayModel() { IsReplay = true };
ApplicationDomain.MessageManager.Send(replayModel);
}
private void ReplayUnchecked()
{
ReplaySendVisibility = Visibility.Hidden;
SliderVisibility = Visibility.Hidden;
ReplayModel replayModel = new ReplayModel() { IsReplay = false };
ApplicationDomain.MessageManager.Send(replayModel);
_initialValue = SliderMaxValue;
}
#endregion
#region Replay发送
private Visibility _replaySendVisibility = Visibility.Hidden;
......@@ -477,6 +534,114 @@ namespace VIZ.FGOUT.Module
#endregion
#region RestartCommand -- 算法重启命令
/// <summary>
/// 算法重启命令
/// </summary>
public VCommand RestartCommand { get; set; }
/// <summary>
/// 算法重启
/// </summary>
private void Restart()
{
MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "重启算法进程需要大概需要1分钟，是否继续?", MessageBoxExButtons.YES_CANCEL);
if (result == MessageBoxExResult.CANCEL)
return;
//// 清理视频控件
//ClearVideoControlContext clear_context = new ClearVideoControlContext(false, true);
//this.ClearVideoControl(clear_context);
//// 算法重启
//this.AlgorithmControllerDic[strategy.Type].RestartAlgorithm();
}
/// <summary>
/// 算法控制器集合
/// </summary>
private readonly Dictionary<AlgorithmStrategyType, IAlgorithmController> AlgorithmControllerDic = new Dictionary<AlgorithmStrategyType, IAlgorithmController>();
/// <summary>
/// 清理视频控件
/// </summary>
/// <param name="context">清理视频控件上下文</param>
public void ClearVideoControl(ClearVideoControlContext context)
{
WPFHelper.Invoke(() =>
{
NDIView view = this.GetView<NDIView>();
if (view == null)
return;
// 清理视频帧
if (context.IsClearVideoFrame)
{
view.video.ClearVideoFrame();
}
// 清理跟踪框
if (context.IsClearTrackingBox)
{
view.video.ClearTrackingBox();
}
});
}
#endregion
#region StopCommand -- 停止算法命令
/// <summary>
/// 停止算法命令
/// </summary>
public VCommand StopCommand { get; set; }
/// <summary>
/// 停止算法
/// </summary>
private void Stop()
{
MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "是否关闭算法?", MessageBoxExButtons.YES_CANCEL);
if (result == MessageBoxExResult.CANCEL)
return;
//// 清理视频控件
//ClearVideoControlContext clear_context = new ClearVideoControlContext(false, true);
//this.ClearVideoControl(clear_context);
//// 停止重启
//Task.Run(() =>
//{
// this.AlgorithmControllerDic[this.StrategyType].StopAlgorithm();
// this.ViewStatus = NDIViewStatus.Stop;
// this.WhenAlgorithmStop();
//});
}
#endregion
#region VideoSettingCommand -- 视频设置命令
/// <summary>
/// 设置命令
/// </summary>
public VCommand VideoSettingCommand { get; set; }
/// <summary>
/// 设置
/// </summary>
/// <param name="key">服务键</param>
private void VideoSetting()
{
NDISettingView view = new NDISettingView("CAM_1", "B0-25-AA-4E-C4-AE__CAM_1");
NoneWindow window = new NoneWindow(1200, 1050, view);
window.Owner = this.GetWindow();
window.ShowDialog();
}
#endregion
#region 落盘开关
public VCommand SaveMatImageCommand { get; set; }
......@@ -537,56 +702,6 @@ namespace VIZ.FGOUT.Module
StartEnable = true;
}
#region Replay功能
public VCommand ReplayCommand { get; set; }
//private bool _replayButtonIsEnable = true;
/// <summary>
/// replay 播控功能
/// </summary>
private void Replay()
{
//if (_replayButtonIsEnable)
// ReplayEnable = _replayButtonIsEnable = false;
//else
// ReplayEnable = _replayButtonIsEnable = true;
//ReplayModel replayModel = new ReplayModel() { IsReplay = !_replayButtonIsEnable };
//ApplicationDomainEx.MessageManager.Send(replayModel);
}
public VCommand SliderValueChangedCommand { get; set; }
private int _initialValue = 150;
private void SliderValueChanged()
{
if (_initialValue != SliderValue)
{
_initialValue = SliderValue;
ReplayModel replayModel = new ReplayModel() { IsReplay = true, IsSliderValueChanged = true, SliderValue = SliderValue};
ApplicationDomain.MessageManager.Send(replayModel);
}
}
public VCommand ReplayCheckedCommand { get; set; }
public VCommand ReplayUncheckedCommand { get; set; }
private void ReplayChecked()
{
ReplaySendVisibility = Visibility.Visible;
SliderVisibility = Visibility.Visible;
SliderValue = SliderMaxValue;
ReplayModel replayModel = new ReplayModel() { IsReplay = true };
ApplicationDomain.MessageManager.Send(replayModel);
}
private void ReplayUnchecked()
{
ReplaySendVisibility = Visibility.Hidden;
SliderVisibility = Visibility.Hidden;
ReplayModel replayModel = new ReplayModel() { IsReplay = false };
ApplicationDomain.MessageManager.Send(replayModel);
_initialValue = SliderMaxValue;
}
#endregion
/// <summary>
/// 开始位置Command命令
/// </summary>
......@@ -806,8 +921,6 @@ namespace VIZ.FGOUT.Module
private void Setting()
{
SystemSettingView view = new SystemSettingView();
//NoneWindow window = new NoneWindow(1200, 800, view);
//window.Owner = this.GetWindow();
view.Show();
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/NDISettingPanelView.xaml
......@@ -28,7 +28,7 @@
</behaviors:EventTrigger>
</behaviors:Interaction.Triggers>
<Border>
<Grid Grid.Row="1" Margin="45,60,40,0">
<Grid Margin="45,60,40,0">
<Grid.RowDefinitions>
<RowDefinition Height="60" />
<RowDefinition Height="60" />
......@@ -53,10 +53,11 @@
</StackPanel>-->
<ComboBox
Grid.Row="1"
Width="510"
Height="40"
ItemsSource="{Binding Path=NDIStreamInfosView, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedNDIStreamInfo, Mode=TwoWay}"
Style="{StaticResource ComboBox_Setting}">
Style="{StaticResource ComboBoxStyle}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Border Background="Transparent" IsHitTestVisible="False">
......@@ -82,10 +83,11 @@
</StackPanel>-->
<ComboBox
Grid.Row="3"
Width="510"
Height="40"
ItemsSource="{Binding Path=NDIPreStreamInfosView, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedNDIPreStreamInfo, Mode=TwoWay}"
Style="{StaticResource ComboBox_Setting}">
Style="{StaticResource ComboBoxStyle}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Border Background="Transparent" IsHitTestVisible="False">
......@@ -105,10 +107,11 @@
Text="赛事" />
<ComboBox
Grid.Row="5"
Width="510"
Height="40"
ItemsSource="{Binding Path=MatchTypes, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedMatchType, Mode=TwoWay}"
Style="{StaticResource ComboBox_Setting}" />
Style="{StaticResource ComboBoxStyle}" />
</Grid>
</Border>
</UserControl>
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/NDISettingView.xaml
......@@ -8,9 +8,9 @@
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:local="clr-namespace:VIZ.FGOUT.Module"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Width="800"
Height="800"
d:DataContext="{d:DesignInstance Type=local:NDISettingViewModel}"
d:DesignHeight="900"
d:DesignWidth="1200"
mc:Ignorable="d">
<UserControl.Resources>
<ResourceDictionary>
......@@ -20,7 +20,6 @@
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Loaded">
<behaviors:InvokeCommandAction Command="{Binding LoadedCommand}" />
......@@ -29,7 +28,7 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="320" />
<ColumnDefinition Width="200" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
......@@ -37,11 +36,13 @@
<RowDefinition Height="*" />
<RowDefinition Height="80" />
</Grid.RowDefinitions>
<Rectangle Grid.RowSpan="3" Fill="#ff0e1221" />
<!-- 左边栏背景色 -->
<Rectangle Grid.RowSpan="3" Fill="{StaticResource TitleBarBackground}" />
<!-- 右边内容区域背景色 -->
<Rectangle
Grid.RowSpan="3"
Grid.Column="1"
Fill="#ff252b3d" />
Fill="{StaticResource RightContentAreaBackground}" />
<StackPanel Margin="45,11,0,0" Orientation="Horizontal">
<TextBlock
MaxWidth="160"
......@@ -87,7 +88,7 @@
<Grid
Grid.Row="2"
Grid.Column="1"
Background="#ff2b3445">
Background="{StaticResource RightContentAreaBackground}">
<StackPanel
HorizontalAlignment="Right"
VerticalAlignment="Center"
......@@ -98,14 +99,14 @@
Margin="0,0,40,0"
Command="{Binding Path=CancelCommand}"
Content="取消"
Style="{StaticResource Button_Setting}" />
Style="{StaticResource ButtonStyle}" />
<Button
Width="120"
Height="40"
Margin="0,0,40,0"
Command="{Binding Path=SaveCommand}"
Content="保存"
Style="{StaticResource Button_Setting}" />
Style="{StaticResource ButtonStyle}" />
</StackPanel>
</Grid>
</Grid>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml
......@@ -88,9 +88,11 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
<ColumnDefinition Width="80" />
<!--<ColumnDefinition Width="120" />-->
<ColumnDefinition Width="*" />
<ColumnDefinition Width="40" />
<!--<ColumnDefinition Width="40" />-->
<ColumnDefinition Width="80" />
</Grid.ColumnDefinitions>
<!-- 调试 -->
<!-- =================================================================================================== -->
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
......@@ -200,6 +200,7 @@ namespace VIZ.FGOUT.Module
//缓存策略2
// 将视频帧转换为Mat对象
//var t1 = DateTime.Now;
var mat = new Mat(e.Frame.Height, e.Frame.Width, MatType.CV_8UC4, e.Frame.DataStream.DataPointer);
// 将帧缩放到低分辨率
var resizedFrame = new Mat();
......@@ -207,6 +208,11 @@ namespace VIZ.FGOUT.Module
_frameBuffer.AddFrame(resizedFrame);
// 释放视频帧资源
mat.Dispose();
//原始帧直接放到队列
//var mat = new Mat(e.Frame.Height, e.Frame.Width, MatType.CV_8UC4, e.Frame.DataStream.DataPointer);
//_frameBuffer.AddFrame(mat);
//var t2 = DateTime.Now;
//var minus = (t2 - t1).TotalMilliseconds;
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/SystemSettingView.xaml
......@@ -24,13 +24,11 @@
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Window.Resources>-->
<behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Loaded">
<behaviors:InvokeCommandAction Command="{Binding LoadedCommand}" />
</behaviors:EventTrigger>
</behaviors:Interaction.Triggers>
<Grid MouseDown="Grid_MouseDown">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="200" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D0BB5FFE537A6B5200A19D083AB7A774B1D7251007C3825FCC8E4913135B82D0"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "58A9C8918EDDD5A194C3881F4D4E1B29ED31209313AAE4C32894090A5E3A7320"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 417 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 420 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D0BB5FFE537A6B5200A19D083AB7A774B1D7251007C3825FCC8E4913135B82D0"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "58A9C8918EDDD5A194C3881F4D4E1B29ED31209313AAE4C32894090A5E3A7320"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 417 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 420 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "529F60D9CD8245A5F2DE0596A96C40D772F418082EF57F471A9F2E86FA9299BE"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "11798D054ECBBA54BDC424EE40D35FA03E049B3A139B570D423A5C0C197C4927"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingPanelView.g.i.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "529F60D9CD8245A5F2DE0596A96C40D772F418082EF57F471A9F2E86FA9299BE"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "11798D054ECBBA54BDC424EE40D35FA03E049B3A139B570D423A5C0C197C4927"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FB4E286F42436164F31DADBED4ACD9C1C7E57D02D94EA3BDD09A9ED5513617C5"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D7BD6613706E6B795E9F04F662AD5FE60417C64E706C6EFBE1AA8FC1891A4AF2"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDISettingView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 64 "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml"
#line 65 "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbNDI;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingView.g.i.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FB4E286F42436164F31DADBED4ACD9C1C7E57D02D94EA3BDD09A9ED5513617C5"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D7BD6613706E6B795E9F04F662AD5FE60417C64E706C6EFBE1AA8FC1891A4AF2"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDISettingView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 64 "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml"
#line 65 "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbNDI;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AC4C5282E6DD55F2DF5E47D88A070C42ABA40818F40EB1AF5CBD0D6EEA1BC1F0"
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A9AB39A00947E81D9A46C56A4286D0D5BBCA4954EE5B4388A904314B90E9E7F4"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 302 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border;
......@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 322 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 324 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video;
......@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 328 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 330 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1;
......@@ -119,49 +119,49 @@ namespace VIZ.FGOUT.Module {
case 2:
this.Border = ((System.Windows.Controls.Border)(target));
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default
#line hidden
#line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default
#line hidden
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default
#line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default
#line hidden
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default
#line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default
#line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default
#line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIView/View/NDIView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AC4C5282E6DD55F2DF5E47D88A070C42ABA40818F40EB1AF5CBD0D6EEA1BC1F0"
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A9AB39A00947E81D9A46C56A4286D0D5BBCA4954EE5B4388A904314B90E9E7F4"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 302 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border;
......@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 322 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 324 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video;
......@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 328 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 330 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1;
......@@ -119,49 +119,49 @@ namespace VIZ.FGOUT.Module {
case 2:
this.Border = ((System.Windows.Controls.Border)(target));
#line 304 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default
#line hidden
#line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default
#line hidden
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default
#line hidden
#line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default
#line hidden
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default
#line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default
#line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default
#line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/SystemSettingView.g.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5D8872D97DDBD98B769566573B5E5BF6AE24B4D801ED0A63E40F71AFCF22A270"
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8A992F1D7DD205E253FBA0C36092CEBC9E5F561A5487EC48125D77F4FFB27D52"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module {
public partial class SystemSettingView : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 60 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 58 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbMatting;
......@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 69 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 67 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbCheckData;
......@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 77 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 75 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbPackage;
......@@ -72,7 +72,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 85 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 83 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbHotkey;
......@@ -80,7 +80,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 93 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 91 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbAbout;
......@@ -119,7 +119,7 @@ namespace VIZ.FGOUT.Module {
{
case 1:
#line 34 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 32 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/SystemSettingView.g.i.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5D8872D97DDBD98B769566573B5E5BF6AE24B4D801ED0A63E40F71AFCF22A270"
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8A992F1D7DD205E253FBA0C36092CEBC9E5F561A5487EC48125D77F4FFB27D52"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -48,7 +48,7 @@ namespace VIZ.FGOUT.Module {
public partial class SystemSettingView : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 60 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 58 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbMatting;
......@@ -56,7 +56,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 69 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 67 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbCheckData;
......@@ -64,7 +64,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 77 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 75 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbPackage;
......@@ -72,7 +72,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 85 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 83 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbHotkey;
......@@ -80,7 +80,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 93 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 91 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbAbout;
......@@ -119,7 +119,7 @@ namespace VIZ.FGOUT.Module {
{
case 1:
#line 34 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 32 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
#line default
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/info.log
This source diff could not be displayed because it is too large. You can view the blob instead.
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/VideoControl.xaml
<UserControl x:Class="VIZ.Framework.Common.VideoControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:common="clr-namespace:VIZ.Framework.Common"
xmlns:converter="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
mc:Ignorable="d" x:Name="uc"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl
x:Class="VIZ.Framework.Common.VideoControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:common="clr-namespace:VIZ.Framework.Common"
xmlns:converter="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
x:Name="uc"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<UserControl.Resources>
<converter:Bool2VisibilityConverter x:Key="Bool2VisibilityConverter"/>
<converter:Bool2VisibilityConverter x:Key="Bool2VisibilityConverter" />
</UserControl.Resources>
<Grid>
<common:VideoCustomRender x:Name="videoRender"></common:VideoCustomRender>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,5,0,0" IsHitTestVisible="False"
Visibility="{Binding Path=IsShowFPS,ElementName=uc,Converter={StaticResource Bool2VisibilityConverter}}">
<TextBlock Text="FPS:" Foreground="Red" FontSize="24"/>
<TextBlock Text="{Binding ElementName=videoRender,Path=Fps}" Foreground="Red" FontSize="24" Margin="10,0,0,0"/>
<common:VideoCustomRender x:Name="videoRender" Margin="0,0,0,0" />
<StackPanel
Margin="5,5,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
IsHitTestVisible="False"
Orientation="Horizontal"
Visibility="{Binding Path=IsShowFPS, ElementName=uc, Converter={StaticResource Bool2VisibilityConverter}}">
<TextBlock
FontSize="24"
Foreground="Red"
Text="FPS:" />
<TextBlock
Margin="10,0,0,0"
FontSize="24"
Foreground="Red"
Text="{Binding ElementName=videoRender, Path=Fps}" />
</StackPanel>
</Grid>
</UserControl>
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/NDI/NDIStream.cs
using System;
using NewTek;
using NewTek.NDI;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Threading;
using NewTek;
using System.Collections.Concurrent;
using System.Runtime.InteropServices;
using NewTek.NDI;
namespace VIZ.Framework.Common
{
......@@ -108,7 +104,6 @@ namespace VIZ.Framework.Common
// 创建NDI流查找实例句柄
this.FindInstancePtr = NDIlib.find_create_v2(ref findCreateDesc);
// 启动NDI流查找任务
this.TaskDic[NDIStreamTaskNames.FIND_STREAM].Start();
// 启动NDI视频帧接收任务
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/NDI/NDIStreamTaskBase.cs
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Threading;
namespace VIZ.Framework.Common
namespace VIZ.Framework.Common
{
/// <summary>
/// NDI流任务
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/NDI/Task/NDIStreamExecuteVideoTask.cs
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Threading;
using NewTek;
using System.Threading;
namespace VIZ.Framework.Common
{
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/NDI/Task/NDIStreamFindStreamTask.cs
using NewTek;
using NewTek.NDI;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common
{
......
VIZ.Framework/VIZ.Framework.Common/VideoControl/Stream/NDI/Task/NDIStreamRecvVideoTask.cs
......@@ -63,6 +63,8 @@ namespace VIZ.Framework.Common
NDIlib.video_frame_v2_t frame = new NDIlib.video_frame_v2_t();
NDIlib.audio_frame_v2_t audio = new NDIlib.audio_frame_v2_t();
NDIlib.metadata_frame_t metadata = new NDIlib.metadata_frame_t();
//NDIlib.recv_bandwidth_e bandwidth = NDIlib.recv_bandwidth_e.recv_bandwidth_lowest;
NDIlib.frame_type_e type = NDIlib.recv_capture_v2(this.Stream.RecvInstancePtr, ref frame, ref audio, ref metadata, 1000);
if (type != NDIlib.frame_type_e.frame_type_video)
......@@ -70,7 +72,6 @@ namespace VIZ.Framework.Common
NDIlib.recv_free_video_v2(this.Stream.RecvInstancePtr, ref frame);
NDIlib.recv_free_audio_v2(this.Stream.RecvInstancePtr, ref audio);
NDIlib.recv_free_metadata(this.Stream.RecvInstancePtr, ref metadata);
return;
}
......@@ -80,7 +81,6 @@ namespace VIZ.Framework.Common
NDIlib.recv_free_video_v2(this.Stream.RecvInstancePtr, ref frame);
NDIlib.recv_free_audio_v2(this.Stream.RecvInstancePtr, ref audio);
NDIlib.recv_free_metadata(this.Stream.RecvInstancePtr, ref metadata);
return;
}
......@@ -117,6 +117,12 @@ namespace VIZ.Framework.Common
Mat srcMat = new Mat(new OpenCvSharp.Size(frame.xres, frame.yres), MatType.CV_8UC4);
Buffer.MemoryCopy(frame.p_data.ToPointer(), srcMat.DataPointer, videoFrame.Length, videoFrame.Length);
// 将帧缩放到低分辨率
//Mat srcMat = new Mat(new OpenCvSharp.Size(frame.xres, frame.yres), MatType.CV_8UC4);
//var resizedFrame = new Mat();
//Cv2.Resize(srcMat, resizedFrame, new Size(srcMat.Width / 4, srcMat.Height / 4));
//Buffer.MemoryCopy(frame.p_data.ToPointer(), resizedFrame.DataPointer, videoFrame.Length, videoFrame.Length);
Mat dstMat = new Mat();
Cv2.Rotate(srcMat, dstMat, this.Stream.Option.Rotation.Value);
......@@ -129,7 +135,10 @@ namespace VIZ.Framework.Common
{
videoFrame.Width = frame.xres;
videoFrame.Height = frame.yres;
//videoFrame.Width = frame.xres / 4;
//videoFrame.Height = frame.yres / 4;
//Buffer.MemoryCopy(frame.p_data.ToPointer(), videoFrame.DataStream.DataPointer.ToPointer(), videoFrame.Length, videoFrame.Length);
Buffer.MemoryCopy(frame.p_data.ToPointer(), videoFrame.DataStream.DataPointer.ToPointer(), videoFrame.Length, videoFrame.Length);
}
}
......
VIZ.Framework/VIZ.Framework.Common/Widgets/NavigationControl/NavigationItemControl.cs
using log4net;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
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.Core;
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\MessageBoxExWindow.xaml;;
......
VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/VideoControl/Control/VideoControl.g.cs
#pragma checksum "..\..\..\..\..\VideoControl\Control\VideoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E9BE7A5C0BA1CE92DB7B54C857968E6F392923CB7949157C6CC6988F524A90DB"
#pragma checksum "..\..\..\..\..\VideoControl\Control\VideoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A6D49351ABA718E582205A0F27928A5A77D7695D4B03F59839E775581B39D545"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -43,7 +43,7 @@ namespace VIZ.Framework.Common {
public partial class VideoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 8 "..\..\..\..\..\VideoControl\Control\VideoControl.xaml"
#line 9 "..\..\..\..\..\VideoControl\Control\VideoControl.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl uc;
......@@ -51,7 +51,7 @@ namespace VIZ.Framework.Common {
#line hidden
#line 14 "..\..\..\..\..\VideoControl\Control\VideoControl.xaml"
#line 17 "..\..\..\..\..\VideoControl\Control\VideoControl.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoCustomRender videoRender;
......@@ -81,6 +81,13 @@ namespace VIZ.Framework.Common {
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
return System.Delegate.CreateDelegate(delegateType, this, handler);
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
......
VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/VideoControl/Control/VideoControl.g.i.cs
#pragma checksum "..\..\..\..\..\VideoControl\Control\VideoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E9BE7A5C0BA1CE92DB7B54C857968E6F392923CB7949157C6CC6988F524A90DB"
#pragma checksum "..\..\..\..\..\VideoControl\Control\VideoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A6D49351ABA718E582205A0F27928A5A77D7695D4B03F59839E775581B39D545"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -43,7 +43,7 @@ namespace VIZ.Framework.Common {
public partial class VideoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 8 "..\..\..\..\..\VideoControl\Control\VideoControl.xaml"
#line 9 "..\..\..\..\..\VideoControl\Control\VideoControl.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl uc;
......@@ -51,7 +51,7 @@ namespace VIZ.Framework.Common {
#line hidden
#line 14 "..\..\..\..\..\VideoControl\Control\VideoControl.xaml"
#line 17 "..\..\..\..\..\VideoControl\Control\VideoControl.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoCustomRender videoRender;
......@@ -81,6 +81,13 @@ namespace VIZ.Framework.Common {
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
return System.Delegate.CreateDelegate(delegateType, this, handler);
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
......
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