Commit 5a44cbbf by 马宁-艾果

NDIStream设置recv_bandwidth_lowest

parent df817341

//------------------------------------------------------------------------------
// <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);
}
}
}
......@@ -10,11 +10,11 @@ none
false
21870986562
2-725104376
31364711570
17-1683084370
3947974750
17-1462717611
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
False
True
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
18560433975
1470602451
11-350624472
24-1321085892
181380438361
1-1441241311
11-1602666439
23-2035776870
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;
False
True
using OpenCvSharp;
using OpenCvSharp.Flann;
using SharpDX;
using SharpDX.Mathematics.Interop;
using System;
......@@ -153,7 +152,6 @@ namespace VIZ.FGOUT.Module
if (view == null)
return;
//Replay
if (view.vm.IsReplay)
{
......@@ -201,13 +199,16 @@ namespace VIZ.FGOUT.Module
// 将视频帧转换为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();
//Cv2.Resize(mat, resizedFrame, new Size(mat.Width / 4, mat.Height / 4));
//_frameBuffer.AddFrame(resizedFrame);
//// 释放视频帧资源
//mat.Dispose();
var mat = new Mat(e.Frame.Height, e.Frame.Width, MatType.CV_8UC4, e.Frame.DataStream.DataPointer);
// 将帧缩放到低分辨率
var resizedFrame = new Mat();
Cv2.Resize(mat, resizedFrame, new Size(mat.Width / 4, mat.Height / 4));
_frameBuffer.AddFrame(resizedFrame);
// 释放视频帧资源
mat.Dispose();
_frameBuffer.AddFrame(mat);
//原始帧直接放到队列
//var mat = new Mat(e.Frame.Height, e.Frame.Width, MatType.CV_8UC4, e.Frame.DataStream.DataPointer);
......
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
22-808211288
4-699044453
90-747441034
151674092382
22-1559853185
4-1529606353
90-1236168610
151915249285
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
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs

FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
2023-10-17 16:40:01,482 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:
2023-10-17 16:40:01,983 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 16:40:06,278 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:
2023-10-17 16:40:06,800 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 16:40:06,830 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 16:40:06,854 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl + C
2023-10-17 16:40:07,104 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl + F
2023-10-17 17:50:59,678 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:
2023-10-17 17:50:59,834 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:
2023-10-17 17:51:00,989 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:
2023-10-17 17:51:01,157 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl + S
2023-10-17 17:59:01,562 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串:{"UE_Presets":{"StartSets":{"EventCode":"JT","DualMode":0,"EnableStats":{"bEnableSpline":false,"bShowHeight":true,"bShowSpeed":true,"bEnableZoom":true},"SplineSets":{"bLineBehind":false},"ZoomSets":{"ZoomEase":"SinusoidalInOut","MoveEase":"SinusoidalInOut","Scale":50.0,"SafeScale":0.9,"ZoomIn":3.0,"ZoomOut":3.0,"Move":3.0,"delay_zoomin_move":1.0,"delay_move_zoomout":1.0,"bMovementOnlyX":false,"MovementOnlyXPosition":0,"bMovementOnlyY":false,"MovementOnlyYPosition":0},"Datas":{"bIsManualMode":false,"Positions":[{"name":"height","x":230,"y":485},{"name":"speed","x":1035,"y":1890}]}}}}
2023-10-17 17:59:03,900 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串:{"UE_Presets":{"StartSets":{"EventCode":"TJ","DualMode":0,"EnableStats":{"bEnableSpline":false,"bShowHeight":true,"bShowSpeed":true,"bEnableZoom":true},"SplineSets":{"bLineBehind":false},"ZoomSets":{"ZoomEase":"SinusoidalInOut","MoveEase":"SinusoidalInOut","Scale":50.0,"SafeScale":0.9,"ZoomIn":3.0,"ZoomOut":3.0,"Move":3.0,"delay_zoomin_move":1.0,"delay_move_zoomout":1.0,"bMovementOnlyX":false,"MovementOnlyXPosition":0,"bMovementOnlyY":false,"MovementOnlyYPosition":0},"Datas":{"bIsManualMode":false,"Positions":[{"name":"height","x":230,"y":485},{"name":"speed","x":1035,"y":1890}]}}}}
2023-10-17 17:59:27,752 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串:{"signal":"auto_Place","start":[],"end":[],"ignore":[],"timecode":0}
2023-10-17 17:59:44,763 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:
2023-10-17 17:59:44,998 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl + F
2023-10-17 17:59:46,499 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:
2023-10-17 17:59:46,714 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:B
2023-10-17 17:59:46,909 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:A
2023-10-17 17:59:47,052 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:O
2023-10-17 17:59:47,416 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:C
2023-10-17 17:59:47,492 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:U
2023-10-17 17:59:47,707 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:N
2023-10-17 17:59:47,974 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:
2023-10-17 17:59:48,244 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:C
2023-10-17 17:59:48,319 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:H
2023-10-17 17:59:48,414 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:E
2023-10-17 17:59:48,490 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:N
2023-10-17 17:59:48,538 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:G
2023-10-17 17:59:48,702 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:G
2023-10-17 17:59:49,185 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:
2023-10-17 18:00:00,215 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:
2023-10-17 18:00:00,743 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 18:00:00,767 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 18:00:00,796 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 18:00:00,827 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 18:00:00,874 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 18:00:00,903 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 18:00:00,926 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 18:00:00,951 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 18:00:01,001 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 18:00:01,026 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl +
2023-10-17 18:00:01,050 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Ctrl + C
2023-10-17 18:02:08,549 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串:{"UE_Presets":{"StartSets":{"EventCode":"TJ","DualMode":0,"EnableStats":{"bEnableSpline":false,"bShowHeight":true,"bShowSpeed":true,"bEnableZoom":true},"SplineSets":{"bLineBehind":false},"ZoomSets":{"ZoomEase":"SinusoidalInOut","MoveEase":"SinusoidalInOut","Scale":50.0,"SafeScale":0.9,"ZoomIn":3.0,"ZoomOut":3.0,"Move":3.0,"delay_zoomin_move":1.0,"delay_move_zoomout":1.0,"bMovementOnlyX":false,"MovementOnlyXPosition":0,"bMovementOnlyY":false,"MovementOnlyYPosition":0},"Datas":{"bIsManualMode":false,"Positions":[{"name":"height","x":230,"y":485},{"name":"speed","x":1035,"y":1890}]}}}}
2023-10-17 18:02:12,372 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串:{"UE_Presets":{"StartSets":{"EventCode":"JT","DualMode":0,"EnableStats":{"bEnableSpline":false,"bShowHeight":true,"bShowSpeed":true,"bEnableZoom":true},"SplineSets":{"bLineBehind":false},"ZoomSets":{"ZoomEase":"SinusoidalInOut","MoveEase":"SinusoidalInOut","Scale":50.0,"SafeScale":0.9,"ZoomIn":3.0,"ZoomOut":3.0,"Move":3.0,"delay_zoomin_move":1.0,"delay_move_zoomout":1.0,"bMovementOnlyX":false,"MovementOnlyXPosition":0,"bMovementOnlyY":false,"MovementOnlyYPosition":0},"Datas":{"bIsManualMode":false,"Positions":[{"name":"height","x":230,"y":485},{"name":"speed","x":1035,"y":1890}]}}}}
2023-10-17 18:02:46,565 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串:{"UE_Presets":{"StartSets":{"EventCode":"JT","DualMode":0,"EnableStats":{"bEnableSpline":false,"bShowHeight":true,"bShowSpeed":true,"bEnableZoom":true},"SplineSets":{"bLineBehind":false},"ZoomSets":{"ZoomEase":"SinusoidalInOut","MoveEase":"SinusoidalInOut","Scale":50.0,"SafeScale":0.9,"ZoomIn":3.0,"ZoomOut":3.0,"Move":3.0,"delay_zoomin_move":1.0,"delay_move_zoomout":1.0,"bMovementOnlyX":false,"MovementOnlyXPosition":0,"bMovementOnlyY":false,"MovementOnlyYPosition":0},"Datas":{"bIsManualMode":false,"Positions":[{"name":"height","x":230,"y":485},{"name":"speed","x":1035,"y":1890}]}}}}
......@@ -56,9 +56,11 @@ VIDEO_SIDE_CHECK_POLYGON_OPACITY=0.15
;视频人工校准区域透明度
VIDEO_MANUAL_CORRECTION_OPACITY=0.2
;视频宽度
VIDEO_WITH=3840
;VIDEO_WITH=3840
VIDEO_WITH=640
;视频高度
VIDEO_HEIGHT=2160
;VIDEO_HEIGHT=2160
VIDEO_HEIGHT=360
; ============================================================
; === Navigation3D ===
; ============================================================
......
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
2-1347366880
21265083526
6968741766
43-1958993781
6-790135758
421356718200
CloseAlgorithmWindow.xaml;MainWindow.xaml;
False
True
......@@ -10,10 +10,10 @@ none
false
DEBUG;TRACE
91711917753
9-721875057
3-1719726047
19-82108094
3-630027162
19-1136530284
Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
False
......
......@@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using static NewTek.NDIlib;
namespace VIZ.Framework.Common
{
......@@ -104,6 +105,7 @@ namespace VIZ.Framework.Common
// 创建NDI流查找实例句柄
this.FindInstancePtr = NDIlib.find_create_v2(ref findCreateDesc);
// 启动NDI流查找任务
this.TaskDic[NDIStreamTaskNames.FIND_STREAM].Start();
// 启动NDI视频帧接收任务
......@@ -200,7 +202,8 @@ namespace VIZ.Framework.Common
NDIlib.recv_create_v3_t recvCreateDesc = new NDIlib.recv_create_v3_t();
recvCreateDesc.source_to_connect_to = info.Source;
recvCreateDesc.color_format = NDIlib.recv_color_format_e.recv_color_format_BGRX_BGRA;
recvCreateDesc.bandwidth = NDIlib.recv_bandwidth_e.recv_bandwidth_highest;
//recvCreateDesc.bandwidth = NDIlib.recv_bandwidth_e.recv_bandwidth_highest;
recvCreateDesc.bandwidth = NDIlib.recv_bandwidth_e.recv_bandwidth_lowest;
recvCreateDesc.allow_video_fields = false;
recvCreateDesc.p_ndi_recv_name = UTF.StringToUtf8(this.LocalRecevierName);
......
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
15488264905
15-721109437
120494897808
44-1238315823
120150095399
44-785521425
MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml;
False
True

C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;;
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Sockets;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;
namespace VIZ.Framework.Connection
{
......
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
11882902973
1-731644535
212023628146
25699837507
212002329545
25439653939
Themes\Generic.xaml;
False
True
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