diff --git a/ENTcapture.sln b/ENTcapture.sln
index f804304..2c6eca6 100644
--- a/ENTcapture.sln
+++ b/ENTcapture.sln
@@ -15,33 +15,21 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup64", "Setup64\Setup64.
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
- Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {80367970-848C-42CE-86DC-6C07E594C0AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {80367970-848C-42CE-86DC-6C07E594C0AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80367970-848C-42CE-86DC-6C07E594C0AF}.Debug|x64.ActiveCfg = Debug|x64
{80367970-848C-42CE-86DC-6C07E594C0AF}.Debug|x64.Build.0 = Debug|x64
- {80367970-848C-42CE-86DC-6C07E594C0AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {80367970-848C-42CE-86DC-6C07E594C0AF}.Release|Any CPU.Build.0 = Release|Any CPU
{80367970-848C-42CE-86DC-6C07E594C0AF}.Release|x64.ActiveCfg = Release|x64
{80367970-848C-42CE-86DC-6C07E594C0AF}.Release|x64.Build.0 = Release|x64
- {C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Debug|Any CPU.ActiveCfg = Debug
{C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Debug|x64.ActiveCfg = Debug
{C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Debug|x64.Build.0 = Debug
- {C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Release|Any CPU.ActiveCfg = Release
{C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Release|x64.ActiveCfg = Release
{C4C5A1E7-FC57-427F-A091-C8B98EE4FEBE}.Release|x64.Build.0 = Release
- {40E878F4-3CE4-4D1F-A20E-105D53A2C4F3}.Debug|Any CPU.ActiveCfg = Debug
{40E878F4-3CE4-4D1F-A20E-105D53A2C4F3}.Debug|x64.ActiveCfg = Debug
- {40E878F4-3CE4-4D1F-A20E-105D53A2C4F3}.Release|Any CPU.ActiveCfg = Release
{40E878F4-3CE4-4D1F-A20E-105D53A2C4F3}.Release|x64.ActiveCfg = Release
- {FB3EB4AA-AE9A-4D5A-BAC3-81630F9E8226}.Debug|Any CPU.ActiveCfg = Debug
{FB3EB4AA-AE9A-4D5A-BAC3-81630F9E8226}.Debug|x64.ActiveCfg = Debug
- {FB3EB4AA-AE9A-4D5A-BAC3-81630F9E8226}.Release|Any CPU.ActiveCfg = Release
{FB3EB4AA-AE9A-4D5A-BAC3-81630F9E8226}.Release|x64.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
diff --git a/OpenCV_CS/App.config b/OpenCV_CS/App.config
index 12db49d..ccf9968 100644
--- a/OpenCV_CS/App.config
+++ b/OpenCV_CS/App.config
@@ -1,15 +1,15 @@
-
+
-
-
+
+
-
-
+
+
-
+
@@ -248,6 +248,9 @@
0
+
+ 0
+
-
\ No newline at end of file
+
diff --git a/OpenCV_CS/ENTcapture.csproj b/OpenCV_CS/ENTcapture.csproj
index 456c5cf..65e5c0d 100644
--- a/OpenCV_CS/ENTcapture.csproj
+++ b/OpenCV_CS/ENTcapture.csproj
@@ -8,7 +8,7 @@
WinExe
ENTcapture
ENTcapture
- v4.7.2
+ v4.8
512
true
false
@@ -37,25 +37,7 @@
false
true
true
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
+
89AA6D9BABBAAE6672A34DE9F07E47359389ACF2
@@ -217,6 +199,9 @@
+
+ Always
+
@@ -246,24 +231,24 @@
3.8.0
- 8.0.3
+ 8.0.5
- 6.9.1
+ 6.11.1
runtime; build; native; contentfiles; analyzers; buildtransitive
all
- 4.9.0.20240103
+ 4.10.0.20240616
- 4.9.0.20240103
+ 4.10.0.20240616
- 4.9.0.20240103
+ 4.10.0.20240616
- 4.9.0.20240103
+ 4.10.0.20240616
diff --git a/OpenCV_CS/Form1.Designer.cs b/OpenCV_CS/Form1.Designer.cs
index 633c6bd..2a38d5c 100644
--- a/OpenCV_CS/Form1.Designer.cs
+++ b/OpenCV_CS/Form1.Designer.cs
@@ -30,7 +30,6 @@ private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
- this.timer1 = new System.Windows.Forms.Timer(this.components);
this.labelMessage = new System.Windows.Forms.Label();
this.buttonExit = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
@@ -104,6 +103,8 @@ private void InitializeComponent()
this.comboBoxID = new System.Windows.Forms.ComboBox();
this.comboBoxName = new System.Windows.Forms.ComboBox();
this.labelFrames = new System.Windows.Forms.Label();
+ this.checkBoxOpenCVmode = new System.Windows.Forms.CheckBox();
+ this.checkBoxSwapAsync = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.trackBar1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fileSystemWatcher1)).BeginInit();
this.toolStrip1.SuspendLayout();
@@ -124,11 +125,6 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.pictureBoxBar)).BeginInit();
this.SuspendLayout();
//
- // timer1
- //
- this.timer1.Interval = 1000;
- this.timer1.Tick += new System.EventHandler(this.timer1_Tick_1);
- //
// labelMessage
//
this.labelMessage.AutoSize = true;
@@ -924,11 +920,36 @@ private void InitializeComponent()
this.labelFrames.TabIndex = 50;
this.labelFrames.Text = "0/0";
//
+ // checkBoxOpenCVmode
+ //
+ this.checkBoxOpenCVmode.AutoSize = true;
+ this.checkBoxOpenCVmode.Location = new System.Drawing.Point(784, 28);
+ this.checkBoxOpenCVmode.Name = "checkBoxOpenCVmode";
+ this.checkBoxOpenCVmode.Size = new System.Drawing.Size(126, 16);
+ this.checkBoxOpenCVmode.TabIndex = 52;
+ this.checkBoxOpenCVmode.Text = "Capture by OpenCV";
+ this.checkBoxOpenCVmode.UseVisualStyleBackColor = true;
+ this.checkBoxOpenCVmode.Visible = false;
+ this.checkBoxOpenCVmode.CheckedChanged += new System.EventHandler(this.checkBoxOpenCVmode_CheckedChanged);
+ //
+ // checkBoxSwapAsync
+ //
+ this.checkBoxSwapAsync.AutoSize = true;
+ this.checkBoxSwapAsync.Location = new System.Drawing.Point(784, 50);
+ this.checkBoxSwapAsync.Name = "checkBoxSwapAsync";
+ this.checkBoxSwapAsync.Size = new System.Drawing.Size(84, 16);
+ this.checkBoxSwapAsync.TabIndex = 53;
+ this.checkBoxSwapAsync.Text = "非同期描画";
+ this.checkBoxSwapAsync.UseVisualStyleBackColor = true;
+ this.checkBoxSwapAsync.CheckedChanged += new System.EventHandler(this.checkBoxSwapAsync_CheckedChanged);
+ //
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(930, 779);
+ this.Controls.Add(this.checkBoxSwapAsync);
+ this.Controls.Add(this.checkBoxOpenCVmode);
this.Controls.Add(this.radioButton6);
this.Controls.Add(this.labelFrames);
this.Controls.Add(this.comboBoxName);
@@ -1007,7 +1028,6 @@ private void InitializeComponent()
private System.Windows.Forms.Button button1;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Button button2;
- private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.Label labelMessage;
private System.Windows.Forms.Button buttonExit;
private System.Windows.Forms.Button buttonSnap;
@@ -1078,6 +1098,8 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox checkBoxFlipX;
private System.Windows.Forms.CheckBox checkBoxFlipY;
private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.CheckBox checkBoxOpenCVmode;
+ private System.Windows.Forms.CheckBox checkBoxSwapAsync;
}
}
diff --git a/OpenCV_CS/Form1.cs b/OpenCV_CS/Form1.cs
index 82b855b..d113b02 100644
--- a/OpenCV_CS/Form1.cs
+++ b/OpenCV_CS/Form1.cs
@@ -1,6 +1,4 @@
using Accord;
-//using System.Threading;
-//using Point = System.Drawing.Point;
using Accord.Imaging.Filters;
using Accord.Video;
using Accord.Video.DirectShow;
@@ -10,14 +8,17 @@
////using Brush = System.Drawing.Brush;
using Shell32;
using System;
+using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
+using System.Drawing.Text;
using System.IO;
using System.Linq;
+using System.Security.Cryptography;
using System.Text;
-using System.Text.RegularExpressions;
+using System.Timers;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -39,6 +40,15 @@ public partial class Form1 : Form
public FilterInfoCollection videoDevices; // カメラデバイスの一覧
private VideoCaptureDevice videoSource = null; // カメラデバイスから取得した映像
private VideoCapabilities[] videoCapabilities;
+
+ private bool CVcapture = false; //true: Capture by OpenCV, false: by Accord
+ private bool CVrunning = false;
+ private Dictionary deviceCapabilities;
+ private VideoCapture capture;
+ private static ConcurrentQueue frameQueue = new ConcurrentQueue();
+ private static Mat previousFrame = null;
+ private static SHA256 sha256 = SHA256.Create();
+
private string message;
private int message_time = 5, t = 0; //Message 表示時間sec
private int rec_start = 4, rec_count = 0; // rec_delay - rec_start間のfpsを測定
@@ -64,12 +74,21 @@ public partial class Form1 : Form
private int[] filterGamma = new int[2] { 0, 10 }; //onoff, gamma*10
private int filterFlip = 10; //10:Off, 0:上下、1:左右、-1：上下左右
private bool lockBmp = false;
+ private bool lockProcessBitmap = false;
+ private bool lockRecord = false, lockSnap = false;
public bool lockOutbmp = false;
private bool MouseUpFlag = false;
private int TotalFrames = 0, SkippedFrames = 0;
+ private long elapsedMillis = 0, firstframeMillis = 0;
+ private long lastDrawTS = 0;
+ private int MaxFPS = 0;
+ private int PauseMS = 0; //フレームスキップms
+ Stopwatch StopwatchCapture = new Stopwatch();
public bool SnapFlag = false, PauseReloadFlag = false;
+ private bool SwapAsync = true;
+
public string videofile;
public string[,] resos = new string[8, 128]; //DeviceName, resos
@@ -77,13 +96,16 @@ public partial class Form1 : Form
//private Accord.Video.FFMPEG.VideoFileWriter acout;
private VideoWriter cvout = new VideoWriter();
- private int cvoutfps = 0, presetFPS = 0;
+ private int presetFPS = 0;
+ private double cvoutfps = 0;
+
//private Bitmap imgout;
// ビットマップの配列を宣言
private int BUFFERNUMBER = 4;
private Bitmap[] bmpBuffer = new Bitmap[4];
private int bufferIndex = 0;
Stopwatch sw = new Stopwatch();
+ private System.Timers.Timer _timer;
Form5 formDisp;
@@ -122,7 +144,12 @@ public Form1()
keyboardHook.KeyDown += KeyboardHook_KeyDown;
keyboardHook.KeyUp += KeyboardHook_KeyUp;
-
+ //非同期タイマー
+ _timer = new System.Timers.Timer(1000); // 1秒ごとに処理
+ _timer.Elapsed += async (sender, e) => await TimerTickAsync();
+ _timer.AutoReset = true;
+ _timer.Start();
+
}
private async void button1_Click(object sender, EventArgs e) //再生
@@ -179,6 +206,9 @@ private async void button1_Click(object sender, EventArgs e) //再生
playmode = 3; //再生中 0:stop,1:recstandby, 2:rec, 3:play, 4:pause
trackBar1.Value = 0;
+
+ lockBmp = false;
+
await playVideoAsync(videofile);
}
@@ -283,7 +313,7 @@ private async Task readVideoAsync(string file) //ファイル再生
vcap.PosFrames = tr - 1;
if (vcap.Read(m))
{
- if (lockBmp)
+ if (lockBmp || lockOutbmp)
{
message = string.Format("サーチ中フレームスキップしました");
t = 0;
@@ -358,36 +388,85 @@ private async void button2_Click(object sender, EventArgs e) //開始終了ボ
{
if (DeviceExist)
{
+ //初期化
TotalFrames = 0;
SkippedFrames = 0;
-
+ firstframeMillis = 0;
+ lastDrawTS = 0;
+ lockBmp = false;
+ lockOutbmp = false;
+ lockProcessBitmap = false;
+ lockRecord = false;
+ lockSnap = false;
+
+ //MaxFPS>0ならばフレームスキップを設定する。presetFPSが設定されていれば、そちらをMaxFPSとする
+ MaxFPS = Properties.Settings.Default.maxfps;
+ if (presetFPS > 0) MaxFPS = presetFPS;
+
+ PauseMS = 0;
+ if (MaxFPS > 0)PauseMS = 1000 / MaxFPS;
+ LogEvents("MaxFPS:" + MaxFPS.ToString() + "で取り込み開始します");
ctlLock(0);
drawStatus(1);
loadFilter(); //デバイスリストに存在すればここでフィルターがOnになる
- connectVideo();
- videoSource.VideoResolution = videoCapabilities[toolStripComboBoxResolution.SelectedIndex];
+ if (!CVcapture)
+ {
+ connectVideo();
+ videoSource.VideoResolution = videoCapabilities[toolStripComboBoxResolution.SelectedIndex];
+
+ LogEvents("[録画開始] Device:" + videoDevices[toolStripComboDevices.SelectedIndex].Name + "/" + toolStripComboBoxResolution.Text);
- LogEvents("[録画開始] Device:" + videoDevices[toolStripComboDevices.SelectedIndex].Name + "/" + toolStripComboBoxResolution.Text);
+ videoSource.NewFrame += new NewFrameEventHandler(videoRendering);
- videoSource.NewFrame += new NewFrameEventHandler(videoRendering);
+ videoSource.Start();
+ StopwatchCapture.Reset();
+ StopwatchCapture.Start();
- videoSource.Start();
+ button2.Text = CaptureButtonOff;
- button2.Text = CaptureButtonOff;
+ message = "取り込み中";
+ if (checkBoxNorec.Checked)
+ {
+ message = "プレビュー中";
+ }
- message = "取り込み中";
- if (checkBoxNorec.Checked)
+ t = 0;
+ //timer1.Enabled = true;
+ video_open = true;
+ rec_count = 0;
+ }
+ else //OpenCV mode
{
- message = "プレビュー中";
- }
+ int deviceIndex = toolStripComboDevices.SelectedIndex;
+ //int deviceIndex = GetDeviceIdByMoniker(videoDevices[toolStripComboDevices.SelectedIndex].MonikerString);
+ int resolutionIndex = toolStripComboBoxResolution.SelectedIndex;
- t = 0;
- //timer1.Enabled = true;
- video_open = true;
- rec_count = 0;
+ var selectedCapability = deviceCapabilities[deviceIndex][resolutionIndex];
+ int cvwidth = selectedCapability.FrameSize.Width;
+ int cvheight = selectedCapability.FrameSize.Height;
+ int cvfps = selectedCapability.AverageFrameRate;
+
+ LogEvents("[録画開始] OpenCV mode Device:" + videoDevices[toolStripComboDevices.SelectedIndex].Name + "/" + toolStripComboBoxResolution.Text);
+
+ button2.Text = CaptureButtonOff;
+
+ message = "取り込み中";
+ if (checkBoxNorec.Checked)
+ {
+ message = "プレビュー中";
+ }
+
+ t = 0;
+ //timer1.Enabled = true;
+ video_open = true;
+ rec_count = 0;
+
+ StartVideoCapture(deviceIndex, cvwidth, cvheight, cvfps);
+
+ }
}
else
{
@@ -401,64 +480,73 @@ private async void button2_Click(object sender, EventArgs e) //開始終了ボ
t = 0;
button2.Text = CaptureButtonOn;
- if (videoSource.IsRunning)
+ if (!CVcapture)
{
- drawStatus(0);
- ctlLock(9);
+ if (videoSource.IsRunning)
+ {
+ drawStatus(0);
+ ctlLock(9);
- // timer1.Enabled = false;
- video_open = false;
+ // timer1.Enabled = false;
+ video_open = false;
- this.CloseVideoSource();
- if (rec_state)
- {
- cvout.Release();
- cvout.Dispose();
- //acout.Close();
- //acout.Dispose();
- rec_state = false;
+ this.CloseVideoSource();
+ if (rec_state)
+ {
+ cvout.Release();
+ cvout.Dispose();
+ //acout.Close();
+ //acout.Dispose();
+ rec_state = false;
+ lockBmp = false;
- LogEvents("[録画終了] Drop frames:" + SkippedFrames.ToString() + "/Total frames:" + TotalFrames.ToString());
+ LogEvents("[録画終了] Drop frames:" + SkippedFrames.ToString() + "/Total frames:" + TotalFrames.ToString());
-
- // 複数の非同期処理を同時に開始
- List tasks = new List();
- // 動画保存の場合は出力フォルダーにコピー
- if (this.checkBoxVideo.Checked)
- {
- Task encodeTask = EncodeAndRSB(videofile);
- //await encodeTask;
- tasks.Add(encodeTask);
- }
- else
- {
- Task rsbTask = Rsb_reload();
- //await rsbTask;
- tasks.Add(rsbTask);
- }
-
- //録画したファイルを再生する
- playmode = 3; //再生中 0:stop,1:recstandby, 2:rec, 3:play, 4:pause
- trackBar1.Value = 0;
+ // 複数の非同期処理を同時に開始
+ List tasks = new List();
- this.Activate();
- this.BringToFront();
+ // 動画保存の場合は出力フォルダーにコピー
+ if (this.checkBoxVideo.Checked)
+ {
+ Task encodeTask = EncodeAndRSB(videofile);
+ //await encodeTask;
+ tasks.Add(encodeTask);
+ }
+ else
+ {
+ Task rsbTask = Rsb_reload();
+ //await rsbTask;
+ tasks.Add(rsbTask);
+ }
- ////フィルターを解除
- //checkBoxWB.Checked = false;
+ //録画したファイルを再生する
+ playmode = 3; //再生中 0:stop,1:recstandby, 2:rec, 3:play, 4:pause
+ trackBar1.Value = 0;
- Task playTask = playVideoAsync(videofile);
- tasks.Add(playTask);
+ this.Activate();
+ this.BringToFront();
- // すべてのタスクが完了するのを待つ
- await Task.WhenAll(tasks);
- }
- else //プレビューのみの場合
- {
- await Rsb_reload();
+ ////フィルターを解除
+ //checkBoxWB.Checked = false;
+
+ Task playTask = playVideoAsync(videofile);
+ tasks.Add(playTask);
+
+ // すべてのタスクが完了するのを待つ
+ await Task.WhenAll(tasks);
+ }
+ else //プレビューのみの場合
+ {
+ await Rsb_reload();
+ }
}
}
+ else //CVcapture
+ {
+ CVrunning = false;
+
+ }
}
}
catch (Exception other)
@@ -475,7 +563,125 @@ private async void button2_Click(object sender, EventArgs e) //開始終了ボ
this.CloseVideoSource();
}
+ }
+
+ private async void StartVideoCapture(int deviceIndex, int width, int height, int fps)
+ {
+ if (capture != null && capture.IsOpened())
+ {
+ capture.Release();
+ }
+
+ // OpenCvSharpのVideoCaptureを作成
+ capture = new VideoCapture(deviceIndex,VideoCaptureAPIs.DSHOW);
+
+ if (!capture.IsOpened())
+ {
+ MessageBox.Show("Cannot open video device");
+ return;
+ }
+ // 解像度とフレームレートの設定
+ capture.Set(VideoCaptureProperties.FrameWidth, width);
+ capture.Set(VideoCaptureProperties.FrameHeight, height);
+ capture.Set(VideoCaptureProperties.Fps, fps);
+ TimeSpan frameInterval = TimeSpan.FromMilliseconds(1000.0 / fps);
+
+ // フレームを読み取るためのスレッドを開始
+ CVrunning = true;
+ Task.Run(() => CaptureLoop(TimeSpan.FromMilliseconds(1000.0 / 120)));
+
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.Start();
+
+ while (CVrunning)
+ {
+ if(stopwatch.Elapsed >= frameInterval)
+ {
+ stopwatch.Restart();
+
+
+ if (lockBmp || lockOutbmp)
+ {
+ SkippedFrames++;
+ message = string.Format("取込中フレームスキップしました");
+ t = 0;
+ LogEvents(message + " Frame:" + TotalFrames.ToString());
+ }
+ else
+ {
+ lockBmp = true;
+
+ if (frameQueue.TryDequeue(out Mat frame))
+ {
+ if (IsNewFrame(frame))
+ {
+ TotalFrames++;
+
+ await ProcessBitmapAsync(frame.ToBitmap(), true);
+ previousFrame?.Dispose();
+ previousFrame = frame.Clone();
+ }
+ frame.Dispose();
+ }
+ else
+ {
+ Thread.Sleep(1); // キューが空の場合、少し待機
+ }
+
+ lockBmp = false;
+ }
+
+ labelFrames.Invoke((MethodInvoker)delegate
+ {
+ labelFrames.Text = "Drop:" + SkippedFrames.ToString() + "/" + TotalFrames.ToString();
+ });
+ }
+ }
+
+ LogEvents("OpenCVキャプチャを終了します");
+
+ capture.Release();
+ }
+
+ private void CaptureLoop(TimeSpan frameInterval)
+ {
+ Stopwatch loopInterval = new Stopwatch();
+ loopInterval.Start();
+ while (CVrunning)
+ {
+ if (loopInterval.Elapsed >= frameInterval)
+ {
+ loopInterval.Restart();
+
+ Mat frame = new Mat();
+ capture.Read(frame);
+ if (!frame.Empty())
+ {
+ frameQueue.Enqueue(frame);
+ }
+ }
+ }
+ }
+
+ private static bool IsNewFrame(Mat frame)
+ {
+ if (previousFrame == null)
+ {
+ return true;
+ }
+
+ string currentHash = ComputeHash(frame);
+ string previousHash = ComputeHash(previousFrame);
+
+ return !currentHash.Equals(previousHash);
+ }
+
+ private static string ComputeHash(Mat mat)
+ {
+ byte[] data = mat.ToBytes();
+ byte[] hash = sha256.ComputeHash(data);
+ return BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
}
private async Task playVideoAsync(string videoFile)
@@ -527,6 +733,8 @@ private void getCameraInfo()
{
// 端末で認識しているカメラデバイスの一覧を取得
videoDevices = new FilterInfoCollection(FilterCategory.VideoInputDevice);
+ deviceCapabilities = new Dictionary();
+
toolStripComboDevices.Items.Clear();
if (videoDevices.Count == 0)
@@ -550,10 +758,14 @@ private void getCameraInfo()
resos[i, j] = string.Format("{0}x{1}:{2}fps", c.FrameSize.Width, c.FrameSize.Height, c.AverageFrameRate);
j++;
}
+
+ deviceCapabilities[i] = videoCapabilities;
+
videoSource = null;
i++;
}
toolStripComboDevices.SelectedIndex = 0;
+
}
catch (Exception ex)
{
@@ -572,6 +784,22 @@ private void connectVideo()
videoCapabilities = videoSource.VideoCapabilities;
}
+ //Accordのmonikerstring -> OpenCV device ID
+ private int GetDeviceIdByMoniker(string monikerString)
+ {
+ for (int i = 0; i < 10; i++) // 通常はシステムに10個以上のカメラデバイスはない
+ {
+ using (var cap = new VideoCapture(i,VideoCaptureAPIs.DSHOW))
+ {
+ if (cap.IsOpened() && cap.GetBackendName().Contains(monikerString))
+ {
+ return i;
+ }
+ }
+ }
+ return -1;
+ }
+
// 描画処理
private async void videoRendering(object sender, NewFrameEventArgs eventArgs)
{
@@ -579,25 +807,47 @@ private async void videoRendering(object sender, NewFrameEventArgs eventArgs)
// |
// [Snap]->[Rec]
TotalFrames++;
+ if (firstframeMillis == 0) firstframeMillis = StopwatchCapture.ElapsedMilliseconds;
+
+ //Console.WriteLine("Elapsed time:" + (StopwatchCapture.ElapsedMilliseconds - lastDrawTS).ToString());
+
+ //一定時間経たないと描画フラグをリセットしない
+ if (!lockProcessBitmap && !lockSnap && StopwatchCapture.ElapsedMilliseconds - lastDrawTS >= PauseMS)
+ {
+ lockBmp = false;
+ //Console.WriteLine("ロック解除" + (StopwatchCapture.ElapsedMilliseconds - lastDrawTS).ToString());
+ }
+ else
+ {
+ if (lockProcessBitmap)
+ {
+ Console.WriteLine("Skipped lockProcessBitmap is 1");
+ }
+ else
+ {
+ Console.WriteLine("Skipped interval < " + PauseMS);
+ }
+ }
if (lockBmp)
{
SkippedFrames++;
message = string.Format("取込中フレームスキップしました");
t = 0;
- LogEvents(message + " Frame:" + TotalFrames.ToString());
+ //LogEvents(message + " Frame:" + TotalFrames.ToString());
return;
}
else
{
lockBmp = true;
+ lastDrawTS = StopwatchCapture.ElapsedMilliseconds;
+ lockProcessBitmap = true;
using (Bitmap ImgOriginal = (Bitmap)eventArgs.Frame.Clone())
{
await ProcessBitmapAsync(ImgOriginal, true);
}
-
- lockBmp = false;
+ lockProcessBitmap = false;
}
labelFrames.Invoke((MethodInvoker)delegate
@@ -613,9 +863,16 @@ private async Task videoRecord(Bitmap bmp)
{
try
{
+ if (lockRecord)
+ {
+ LogEvents("録画フレームをスキップしました"+ TotalFrames.ToString());
+ }
+
// delay経過 fpsは取得できてるはず
- if (rec_count >= rec_start && cvoutfps > 0 && rec_state == false)
+ if (!lockRecord && rec_count >= rec_start && cvoutfps > 0 && rec_state == false)
{
+ lockRecord = true;
+
drawStatus(2);
Debug.WriteLine("Rec start. FPS is " + cvoutfps.ToString());
@@ -629,7 +886,7 @@ private async Task videoRecord(Bitmap bmp)
int fc;
if (s == "raw") fc = 0;
- else if (s[0] == 'M' || s[0] == 'H')
+ else if (s[0] == 'M' || s[0] == 'H' || s[0] == 'm' || s[0] == 'h')
{
ex = ".mp4";
FourCC fourcc = VideoWriter.FourCC(s[0], s[1], s[2], s[3]);
@@ -654,8 +911,8 @@ private async Task videoRecord(Bitmap bmp)
Debug.WriteLine(string.Format("OpenCvSharp.Size:{0}x{1}, Codec:{2},file:{3}", vwidth, vheight, s, videofile));
- int fps = cvoutfps;
- if (presetFPS > 0) fps = presetFPS;
+ double fps = cvoutfps;
+ //if (presetFPS > 0) fps = presetFPS;
cvout = new VideoWriter(videofile, fc, fps, dsize);
Debug.WriteLine("cvout start.");
@@ -665,18 +922,19 @@ private async Task videoRecord(Bitmap bmp)
cvout.Set(VideoWriterProperties.Quality, 100);
message = string.Format("録画開始:file:{0}", videofile);
t = 0;
+
}
- if (rec_state)
+ if (rec_state && !lockRecord)
{
+ lockRecord = true;
+
await Task.Run(() =>
{
using (Mat m = bmp.ToMat())
{
cvout.Write(m);
- //m.Dispose();
}
});
-
}
}
catch (Exception e)
@@ -691,7 +949,7 @@ await Task.Run(() =>
rec_state = false;
//bmp.Dispose();
}
-
+ finally { lockRecord = false; }
}
//画像表示関数
@@ -699,6 +957,8 @@ private async Task ProcessBitmapAsync(Bitmap bitmap, bool Rec)
{
try
{
+ //Console.WriteLine(StopwatchCapture.ElapsedMilliseconds.ToString() + "ProcessBitmapAsync() is called");
+
if (MouseUpFlag) // フィルタ領域の設定完了→RBG平均を数値ボックスにセット
{
//Flip時座標変換
@@ -714,6 +974,7 @@ await Task.Run(() =>
if (checkBoxWB.Checked)
{
+ //Console.WriteLine("WB filter start");
await ApplyWBasync(bitmap, filterWB[1], filterWB[2], filterWB[3]);
if (filterGamma[1] != 10)
@@ -725,6 +986,8 @@ await Task.Run(() =>
{
bitmap.RotateFlip(OpenCVFilterMode2RotationFlipType(filterFlip));
}
+ //Console.WriteLine("WB filter end");
+
}
@@ -736,14 +999,31 @@ await Task.Run(() =>
{
Task SnapTask = SnapBmp(bitmap);
tasks.Add(SnapTask);
+ //_ = Task.Run(async () =>
+ //{
+ // try
+ // {
+ // await SnapBmp(bitmap);
+ // }
+ // catch (Exception ex)
+ // {
+ // // エラーが発生した場合にログを記録
+ // LogError(ex);
+ // }
+ //});
+
SnapFlag = false;
}
- if (!lockOutbmp)
+ if (!lockOutbmp) //描画
{
+ lockOutbmp = true;
+ lastDrawTS = StopwatchCapture.ElapsedMilliseconds;
+
bmpBuffer[bufferIndex]?.Dispose();
bmpBuffer[bufferIndex] = (Bitmap)bitmap.Clone();
+ //Console.WriteLine(StopwatchCapture.ElapsedMilliseconds.ToString() + "Cloned to Buffer No: " + bufferIndex.ToString());
//MOUSE 領域指定
if (filterPain)
@@ -760,19 +1040,56 @@ await Task.Run(() =>
//描画
if (!formDisp.Created || formDisp == null)
{
- Task DrawTask = Task.Run(() => SwapImage(pictureBox1, bmpBuffer[bufferIndex]));
- tasks.Add(DrawTask);
+ if (SwapAsync)
+ {
+ // タスクをリストに追加して、awaitせずに非同期処理を開始
+ Task drawTask = SwapImageAsync(pictureBox1, bmpBuffer[bufferIndex]);
+ tasks.Add(drawTask);
+ }
+ else
+ {
+ Task DrawTask = Task.Run(() => SwapImage(pictureBox1, bmpBuffer[bufferIndex]));
+ tasks.Add(DrawTask);
+ }
+
+
+
}
else
{
- if(pictureBox1.Image != null) SwapImage(pictureBox1, null);
-
- Task DrawForm5Task = Task.Run(() => formDisp.BeginInvoke(formDisp.dShowBmp, bmpBuffer[bufferIndex], vwidth, vheight));
+ Task DrawForm5Task = Task.Run(() =>
+ {
+ try
+ {
+ formDisp.BeginInvoke(formDisp.dShowBmp, bmpBuffer[bufferIndex], vwidth, vheight);
+ }
+ catch(Exception ex)
+ {
+ LogError(ex);
+ }
+ }
+ );
tasks.Add(DrawForm5Task);
+
+ if (SwapAsync)
+ {
+ if (pictureBox1.Image != null) await SwapImageAsync(pictureBox1, null);
+ }
+ else
+ {
+ if (pictureBox1.Image != null) SwapImage(pictureBox1, null);
+ }
}
-
+
+ bufferIndex++;
+ if (bufferIndex >= BUFFERNUMBER) bufferIndex = 0;
//bmpBuffer[bufferIndex]?.Dispose();
}
+ else
+ {
+ //Console.WriteLine(StopwatchCapture.ElapsedMilliseconds.ToString() + "Passed drawing bitmap");
+ //if (StopwatchCapture.ElapsedMilliseconds - lastDrawTS > 30) lockOutbmp = false;
+ }
//録画
if (Rec && !checkBoxNorec.Checked)
@@ -784,8 +1101,9 @@ await Task.Run(() =>
// すべてのタスクが完了するのを待つ
await Task.WhenAll(tasks);
- bufferIndex++;
- if (bufferIndex >= BUFFERNUMBER) bufferIndex = 0;
+ lockOutbmp = false;
+ //Console.WriteLine(StopwatchCapture.ElapsedMilliseconds.ToString() + "All tasks are finished");
+
}
catch (Exception e)
{
@@ -841,7 +1159,9 @@ private async void Form1_Load(object sender, EventArgs e)
loadFilter();
- this.timer1.Enabled = true;
+ checkBoxSwapAsync.Checked = SwapAsync;
+
+ //this.timer1.Enabled = true;
//古いログの削除
DateTime cutoffDate = DateTime.Now.AddDays(-14);
@@ -937,6 +1257,12 @@ private void initForm()
//filterlist
setFilterList(Properties.Settings.Default.filter);
+ //OpenCVmode
+ checkBoxOpenCVmode.Checked = CVcapture;
+
+ //maxFPS
+ MaxFPS = Properties.Settings.Default.maxfps;
+
drawStatus(0);
@@ -1037,7 +1363,8 @@ private async Task ForceStop()
{
playmode = 0;
- await Task.Run(() => SwapImage(pictureBox1, null));
+ //await Task.Run(() => SwapImage(pictureBox1, null));
+ await SwapImageAsync(pictureBox1, null);
//if (this.pictureBox1.Image != null)
//{
// this.pictureBox1.Image.Dispose();
@@ -1305,19 +1632,22 @@ private void trackBar1_MouseDown(object sender, MouseEventArgs e)
}
-
- // フレームレートの取得
- private void timer1_Tick_1(object sender, EventArgs e)
+ private async Task TimerTickAsync()
{
+ //Console.WriteLine("Ticker elapsed:" + StopwatchCapture.ElapsedMilliseconds.ToString());
+
if (video_open)
{
- int f = videoSource.FramesReceived;
+ double f;
+ long elapsedMillis = StopwatchCapture.ElapsedMilliseconds;
+ f = (double)(TotalFrames - SkippedFrames) * 1000 / (elapsedMillis - firstframeMillis);
+
rec_count++;
- //最大録画時間超過
+ // 最大録画時間超過
if (rec_count > Properties.Settings.Default.timeout * 60 && !checkBoxNorec.Checked)
{
- this.button2.PerformClick();
+ Invoke((Action)(() => button2.PerformClick()));
}
if (rec_count >= rec_start)
@@ -1325,33 +1655,99 @@ private void timer1_Tick_1(object sender, EventArgs e)
cvoutfps = f;
}
- labelFPS.Text = f.ToString() + "fps";
- labelTime.Text = rec_count.ToString() + "sec";
+ // UIの更新をUIスレッドで行う
+ Invoke((Action)(() =>
+ {
+ labelFPS.Text = f.ToString("F1") + "fps";
+ labelTime.Text = rec_count.ToString() + "sec";
+ }));
}
-
if (keydown)
{
TimeSpan ts = sw.Elapsed;
- labelMessage.Text += ts.TotalMilliseconds.ToString();
if (ts.TotalMilliseconds > 2000)
{
- // MessageBox.Show(ts.TotalMilliseconds.ToString());
- this.button2.PerformClick();
+ Invoke((Action)(() => button2.PerformClick()));
sw.Stop();
sw.Reset();
}
+
+ // UIの更新をUIスレッドで行う
+ Invoke((Action)(() => labelMessage.Text += ts.TotalMilliseconds.ToString()));
}
- labelMessage.Text = message;
t++;
if (t > message_time)
{
message = "";
}
+ // メッセージの更新をUIスレッドで行う
+ Invoke((Action)(() => labelMessage.Text = message));
}
+ // フレームレートの取得
+ //private void timer1_Tick_1(object sender, EventArgs e)
+ //{
+ // Console.WriteLine("Ticker elapsed:" + StopwatchCapture.ElapsedMilliseconds.ToString());
+
+ // if (video_open)
+ // {
+ // float f;
+
+ // elapsedMillis = StopwatchCapture.ElapsedMilliseconds;
+ // f = (float)(TotalFrames - SkippedFrames) * 1000 / elapsedMillis;
+
+ // //if (CVcapture)
+ // //{
+ // // f = TotalFrames;
+ // //}
+ // //else
+ // //{
+ // // f = videoSource.FramesReceived;
+ // //}
+
+ // rec_count++;
+
+ // //最大録画時間超過
+ // if (rec_count > Properties.Settings.Default.timeout * 60 && !checkBoxNorec.Checked)
+ // {
+ // this.button2.PerformClick();
+ // }
+
+ // if (rec_count >= rec_start)
+ // {
+ // cvoutfps = (int)f;
+ // }
+
+ // labelFPS.Text = f.ToString("F1") + "fps";
+ // labelTime.Text = rec_count.ToString() + "sec";
+ // }
+
+
+ // if (keydown)
+ // {
+ // TimeSpan ts = sw.Elapsed;
+ // labelMessage.Text += ts.TotalMilliseconds.ToString();
+ // if (ts.TotalMilliseconds > 2000)
+ // {
+ // // MessageBox.Show(ts.TotalMilliseconds.ToString());
+ // this.button2.PerformClick();
+ // sw.Stop();
+ // sw.Reset();
+ // }
+ // }
+
+ // labelMessage.Text = message;
+ // t++;
+ // if (t > message_time)
+ // {
+ // message = "";
+ // }
+
+ //}
+
private void toolStripComboDevices_TextChanged(object sender, EventArgs e)
{
Debug.WriteLine("ToolComboDevice is called");
@@ -1424,6 +1820,10 @@ private async void buttonExit_Click(object sender, EventArgs e)
{
try
{
+ // フォームが閉じる際にタイマーを停止する
+ _timer.Stop();
+ _timer.Dispose();
+
this.CloseVideoSource();
deleteOldFiles(Properties.Settings.Default.autodelete, Properties.Settings.Default.tmpdir);
}
@@ -1449,9 +1849,11 @@ private async Task SnapBmp(Bitmap bmp) //Success :true
{
string error_message = "";
- lockBmp = true;
+ lockSnap = true;
+ Bitmap imgsnap = (Bitmap)bmp.Clone();
+ lockSnap = false;
- using (Bitmap imgsnap = (Bitmap)bmp.Clone())
+ using (imgsnap)
{
int w = imgsnap.Width;
int h = imgsnap.Height;
@@ -1500,7 +1902,7 @@ private async Task SnapBmp(Bitmap bmp) //Success :true
LogError(ex);
MessageBox.Show("Snapファイルの作成時にエラーが発生しました。もう一度静止画取得を試みてください。");
- lockBmp = false;
+ //lockBmp = false;
return;
}
@@ -1571,13 +1973,14 @@ private async Task SnapBmp(Bitmap bmp) //Success :true
LogError(ex);
MessageBox.Show("画像切り出し、文字埋込みでエラーが発生しました: " + ex.ToString());
- lockBmp = false;
+ //lockBmp = false;
return;
}
try
{
- await Task.Run(() => SaveImage(saveimg, snapFile, jpeg_quality));
+ //await Task.Run(() => SaveImage(saveimg, snapFile, jpeg_quality));
+ await SaveImageAsync(saveimg, snapFile, jpeg_quality);
}
catch (Exception ex)
{
@@ -1587,34 +1990,41 @@ private async Task SnapBmp(Bitmap bmp) //Success :true
LogError(ex);
MessageBox.Show("画像保存でエラーが発生しました");
- lockBmp = false;
+ //lockBmp = false;
return;
}
try
{
- if (pictureBox6.Image != null) await Task.Run(() => SwapImage(pictureBox7, (Image)pictureBox6.Image.Clone()));
- if (pictureBox5.Image != null) await Task.Run(() => SwapImage(pictureBox6, (Image)pictureBox5.Image.Clone()));
- if (pictureBox4.Image != null) await Task.Run(() => SwapImage(pictureBox5, (Image)pictureBox4.Image.Clone()));
- if (pictureBox3.Image != null) await Task.Run(() => SwapImage(pictureBox4, (Image)pictureBox3.Image.Clone()));
- if (pictureBox2.Image != null) await Task.Run(() => SwapImage(pictureBox3, (Image)pictureBox2.Image.Clone()));
- }
- catch (Exception ex)
- {
- keydown = false;
- sw.Stop();
+ if (SwapAsync)
+ {
+ // PictureBox7から順番に非同期でスワップを実行
+ var tasks = new List
+ {
+ //SaveImageAsync(saveimg, snapFile, jpeg_quality),
+ pictureBox6.Image != null ? SwapImageAsync(pictureBox7, (Image)pictureBox6.Image.Clone()) : Task.CompletedTask,
+ pictureBox5.Image != null ? SwapImageAsync(pictureBox6, (Image)pictureBox5.Image.Clone()) : Task.CompletedTask,
+ pictureBox4.Image != null ? SwapImageAsync(pictureBox5, (Image)pictureBox4.Image.Clone()) : Task.CompletedTask,
+ pictureBox3.Image != null ? SwapImageAsync(pictureBox4, (Image)pictureBox3.Image.Clone()) : Task.CompletedTask,
+ pictureBox2.Image != null ? SwapImageAsync(pictureBox3, (Image)pictureBox2.Image.Clone()) : Task.CompletedTask,
+ SwapImageAsync(pictureBox2, (Image)saveimg.Clone())
+ };
+
+ // 全てのタスクが完了するのを待つ
+ await Task.WhenAll(tasks);
+ }
+ else
+ {
+ if (pictureBox6.Image != null) await Task.Run(() => SwapImage(pictureBox7, (Image)pictureBox6.Image.Clone()));
+ if (pictureBox5.Image != null) await Task.Run(() => SwapImage(pictureBox6, (Image)pictureBox5.Image.Clone()));
+ if (pictureBox4.Image != null) await Task.Run(() => SwapImage(pictureBox5, (Image)pictureBox4.Image.Clone()));
+ if (pictureBox3.Image != null) await Task.Run(() => SwapImage(pictureBox4, (Image)pictureBox3.Image.Clone()));
+ if (pictureBox2.Image != null) await Task.Run(() => SwapImage(pictureBox3, (Image)pictureBox2.Image.Clone()));
+ await Task.Run(() => SwapImageAsync(pictureBox2, (Image)saveimg.Clone()));
+ }
- LogError(ex);
- MessageBox.Show("PictureboxのDispose処理でエラーが発生しました");
- lockBmp = false;
- return;
- }
- try
- {
- await Task.Run(() => SwapImage(pictureBox2, (Image)saveimg.Clone()));
- //pictureBox2.Image = (Image)saveimg.Clone();
}
catch (Exception ex)
{
@@ -1623,15 +2033,16 @@ private async Task SnapBmp(Bitmap bmp) //Success :true
LogError(ex);
- MessageBox.Show("Picturebox2の表示でエラーが発生しました");
- lockBmp = false;
+ MessageBox.Show("PictureboxのDispose処理でエラーが発生しました");
+ //lockBmp = false;
return;
}
+
try
{
- saveimg.Dispose();
- imgsnap.Dispose();
+ saveimg?.Dispose();
+ imgsnap?.Dispose();
}
catch(Exception ex)
{
@@ -1641,7 +2052,7 @@ private async Task SnapBmp(Bitmap bmp) //Success :true
LogError(ex);
MessageBox.Show("最終のDispose処理でエラーが発生しました");
- lockBmp = false;
+ //lockBmp = false;
return;
}
@@ -1653,7 +2064,7 @@ private async Task SnapBmp(Bitmap bmp) //Success :true
LogEvents("静止画キャプチャしました。ファイル名:" + snapFile);
}
}
- lockBmp = false;
+ lockSnap = false;
}
@@ -1794,37 +2205,66 @@ private void toolStripComboDevices_SelectedIndexChanged(object sender, EventArgs
///
/// 変換する画像ファイル名
/// 品質
- private void SaveImage(Bitmap bmp, string fileName, int quality)
- {
- try
- {
- //EncoderParameterオブジェクトを1つ格納できる
- //EncoderParametersクラスの新しいインスタンスを初期化
- //ここでは品質のみ指定するため1つだけ用意する
- System.Drawing.Imaging.EncoderParameters eps =
- new System.Drawing.Imaging.EncoderParameters(1);
- //品質を指定
- System.Drawing.Imaging.EncoderParameter ep =
- new System.Drawing.Imaging.EncoderParameter(
- System.Drawing.Imaging.Encoder.Quality, (long)quality);
- //EncoderParametersにセットする
- eps.Param[0] = ep;
-
- //イメージエンコーダに関する情報を取得する
- System.Drawing.Imaging.ImageCodecInfo ici = GetEncoderInfo("image/jpeg");
-
- //保存する
- bmp.Save(fileName, ici, eps);
-
- eps.Dispose();
- }
- catch (Exception ex)
+ //private void SaveImage(Bitmap bmp, string fileName, int quality)
+ //{
+ // try
+ // {
+ // //EncoderParameterオブジェクトを1つ格納できる
+ // //EncoderParametersクラスの新しいインスタンスを初期化
+ // //ここでは品質のみ指定するため1つだけ用意する
+ // System.Drawing.Imaging.EncoderParameters eps =
+ // new System.Drawing.Imaging.EncoderParameters(1);
+ // //品質を指定
+ // System.Drawing.Imaging.EncoderParameter ep =
+ // new System.Drawing.Imaging.EncoderParameter(
+ // System.Drawing.Imaging.Encoder.Quality, (long)quality);
+ // //EncoderParametersにセットする
+ // eps.Param[0] = ep;
+
+ // //イメージエンコーダに関する情報を取得する
+ // System.Drawing.Imaging.ImageCodecInfo ici = GetEncoderInfo("image/jpeg");
+
+ // //保存する
+ // bmp.Save(fileName, ici, eps);
+
+ // eps.Dispose();
+ // }
+ // catch (Exception ex)
+ // {
+ // LogError(ex);
+
+ // MessageBox.Show("Jpegファイルの保存に失敗しました");
+
+ // }
+ //}
+
+ private async Task SaveImageAsync(Bitmap bmp, string fileName, int quality)
+ {
+ await Task.Run(() =>
{
- LogError(ex);
+ try
+ {
+ // EncoderParameterオブジェクトを1つ格納できるEncoderParametersクラスの新しいインスタンスを初期化
+ using (System.Drawing.Imaging.EncoderParameters eps = new System.Drawing.Imaging.EncoderParameters(1))
+ {
+ // 品質を指定
+ System.Drawing.Imaging.EncoderParameter ep = new System.Drawing.Imaging.EncoderParameter(
+ System.Drawing.Imaging.Encoder.Quality, (long)quality);
+ eps.Param[0] = ep;
- MessageBox.Show("Jpegファイルの保存に失敗しました");
+ // イメージエンコーダに関する情報を取得する
+ System.Drawing.Imaging.ImageCodecInfo ici = GetEncoderInfo("image/jpeg");
- }
+ // 保存する
+ bmp.Save(fileName, ici, eps);
+ }
+ }
+ catch (Exception ex)
+ {
+ LogError(ex);
+ MessageBox.Show("Jpegファイルの保存に失敗しました");
+ }
+ });
}
//MimeTypeで指定されたImageCodecInfoを探して返す
@@ -2547,6 +2987,17 @@ private void numericUpDownG_ValueChanged(object sender, EventArgs e)
filterWB[2] = (int)numericUpDownG.Value;
}
+ private void checkBoxOpenCVmode_CheckedChanged(object sender, EventArgs e)
+ {
+ CVcapture = checkBoxOpenCVmode.Checked;
+ }
+
+ private void checkBoxSwapAsync_CheckedChanged(object sender, EventArgs e)
+ {
+ SwapAsync = checkBoxSwapAsync.Checked;
+ LogEvents("非同期描画モード" + SwapAsync.ToString());
+ }
+
private void numericUpDownB_ValueChanged(object sender, EventArgs e)
{
filterWB[3] = (int)numericUpDownB.Value;
@@ -2890,8 +3341,11 @@ private void SwapImage(PictureBox pictureBox, Image newImage)
try
{
var oldImg = pictureBox.Image;
- pictureBox.Image = newImage;
- oldImg?.Dispose();
+ if (!ImageAnimator.CanAnimate(newImage))
+ {
+ pictureBox.Image = newImage;
+ oldImg?.Dispose();
+ }
}
catch (Exception ex)
{
@@ -2902,6 +3356,37 @@ private void SwapImage(PictureBox pictureBox, Image newImage)
}
}
+ private async Task SwapImageAsync(PictureBox pictureBox, Image newImage)
+ {
+ if (pictureBox == null)
+ {
+ throw new ArgumentNullException(nameof(pictureBox));
+ }
+ try
+ {
+ var oldImg = pictureBox.Image;
+
+ if (!ImageAnimator.CanAnimate(newImage))
+ {
+ pictureBox.BeginInvoke((Action)(() =>
+ {
+ pictureBox.Image = newImage;
+ oldImg?.Dispose();
+
+ }));
+ }
+
+ // メモリ解放のチェック
+ await Task.Delay(1); // 必要に応じて間隔を調整
+ }
+ catch (Exception ex)
+ {
+ LogError(ex);
+ message = "描画中にエラーが発生しました";
+ t = 0;
+ }
+ }
+
private void KeyboardHook_KeyDown(object sender, KeyEventArgs e)
{
//MessageBox.Show("Keyboard down event:" + e.KeyData.ToString());
diff --git a/OpenCV_CS/Form1.resx b/OpenCV_CS/Form1.resx
index 9ef9d2a..49919a3 100644
--- a/OpenCV_CS/Form1.resx
+++ b/OpenCV_CS/Form1.resx
@@ -117,16 +117,13 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 17, 17
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAH9JREFUSEvt
- lcEJgDAQBNOPjViBdqO9ahk+dA8MSIjsZUPERwbmo+SGSIihU8IId3gSZTaYG5gqUz2A8dvAektRAgM8
- oK2jEXUHE3RF1IAxQxp5C8TnJWYj8WXKc6HXooCHqk/EcA03lMAnx3SBdLihBtw0DzS/rpv/cDoZQrgA
- PTZvQ2yf530AAAAASUVORK5CYII=
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAHVJREFUSEvt
+ 1cEJgDAMheG3j4s4gW6ju+oYHpRAvUXy+krUQz/IRWh+ELFAV2EEsAM4g5FtzjJvZM0LIr8NrGVCSmAA
+ cJRzYUQJmImNqAEzM5GnwP28ZtzIZwFG0yuKUMuNEnjlM12Y5UYN0NID6b/r9Aunc109Nm9DXZYulwAA
+ AABJRU5ErkJggg==
@@ -146,40 +143,38 @@
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAMtJREFUSEvV
- lE0KwkAMRucAuteFd3HpMTyEK4+lNxBPUu+hfg8aCJO01IER+uBBSb5MoT8p/+Yz2o113sAOnRKyunmR
- s2RDXsjq5lue5SJsqMYfuMSXPMmABcAPtDjIgDXBh1udpQ7f5VFuRrmmVue8gSyEV2nsRg162QwGstBN
- wkE+pdW5pgZk/IwZyEI8CnjIukcNyNQ9DGShrdxXNS89MlkvkIW636D7I+r+krHrZ2p2/dFaDbCgsmCL
- 6bJjxbJqs4FfnFzXa6OUL0VlKifvBhynAAAAAElFTkSuQmCC
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAMhJREFUSEvV
+ lN0JwkAQhKcA864P9pJHy7AInyxLOxAriX2ojNzCMrlL7iIrZuCDY3ZuF/KzwI/1SoRpnQOsaYm5zEn6
+ jaQXlLnME8BRehblm+b8Wh4ADtqE8gP0UiuD9P7Iiv78DZPS8BVAD2CT4Jme5iYHaMA4u8w2YWJN800D
+ Lqm2B3B3Ps/0KGb0XvUAPgrqlqnRo5jRWvWADsAu4xusMaP+/wwIf0ThL5mEfqZG6I+2lJG4oDS0lOyy
+ 44rlqtVwK8V1vT69AUVlKidKl8RZAAAAAElFTkSuQmCC
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAGxJREFUSEvt
- lEsKgDAMRHMU738O79GjqIMGgkxoYs0uDx5tIZlFf9I0v7NfHknRY9mekcICIioIH/eUw5ojAg3XNeXd
- GNWGQxfblNGGQxdbtKILK/6iCyuOWL5F5YcMSq+pMn1o5V9F02QROQGbxMJRcTseKwAAAABJRU5ErkJg
- gg==
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAGlJREFUSEvt
+ 1MsJwDAMA1CP0v3n6B4dJUUHg6Jg6oT65gc6BCIH0o9Za3+7zWxsBh12yXqi5Wwchj+0XmgxG/DhfOBC
+ i9nw8JIDeDgS0uJpQrrxNCHdmE35FZU/ZCh9Td3nh1b+q2ht3wubxMJR/NkPawAAAABJRU5ErkJggg==
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAcBJREFUWEft
- lTtLA1EQhRcbGxsbC0Gx8B/YiUXKvEhIEQQrLbQRwUrFasHKSrGwEsSfIPgrbEQRwUoRxULEF74wPr5Z
- 5obLmhVNbrwEcuCwOzP3njk7m7sJWga5XG4IHsFLR7yD80E2mw3z+Xy/9kkE67bY8Oma8mRycwvXMTKi
- /b6h2QZs7tBsTPtW8Z8GDA9ouqD9vRiIyGtJtQ20Dfgy4O0UePkO+PsSIuz3v+C3YPEwJs64PjhihQcP
- Vb7FIUf1J+qy5qBUKvUwzprv15BXN67L3YMGK/GGFj/gOzzR5W6BcLc2MnyKxRX4JvdNmQLCi9ooohxp
- O4ZX8BXKJNxOoVwudyH6CE2z87gB4iWuL/BZY3dTQHBWRA35tc/FDRQKhV6u99AYdTOFTCbTidipikrz
- fcnHDWhumbp8eKKckykgOG03Ip6UfC0DxWKxj3uZgsk3NoUwDDsQ2TOCNN/VUk0DAvKrxDcm39AUEJgy
- QkIMjGop0YBO4dqq1T8FNm9bQseajpBkQEC8llT7E3jiCSMiDTUdgdyMqcELTUdgX8qqbWq6PoiYUMMq
- OHaDiG/Aw7g5gdmXTqcHNOUbQfAFUiQLulV9mg4AAAAASUVORK5CYII=
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAZVJREFUWEft
+ lTtLA0EUhYONjY2NhaBY+A/sxMIyud9lQ4ogWGmhjQhWKlYLVlaKhZUg/gTBX2EjighWiigWIr7whfHB
+ yC4Ml6wYMmEJeOBAck9mz5kTdqZQaBcAQ8AxcBWI98BCQURiVe23hhYisg18habbmftwB2yo6og1TtHq
+ AD53RWQ8zwApD0VkMc8AP1TV0f8A/wHyCpDbW5DLOZDfSZj7XfBXAMMicg48BmJNVWPr055wr+pvtL8P
+ ikql0mP/V0sRmbDrggFYtYYeP4EP4NSuCwKg2xg+m+814L1lLQBLpurYBLgG3pImwrZQrVa7gCfP7MIG
+ EJFl4BV4Cd4CMOebqeq8DRBFUS/w4AUN00KpVOoEzjzzAze3AZLZiqq6gydtpfkWVHXG7H7KzesFKJfL
+ fUkL6by5FuI47gD2PfO9VKsXIJmvAbdBWgCmze7HUi0rQNLCTZAWgB3vQSe+lhXAAVjP0hqCqk6mD3GG
+ vgbMeiaXvubuBE/b8rWGkXXJRFE0CGwCRzacQ7quWCwOWC03fANSJAu6Z/CWVgAAAABJRU5ErkJggg==
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAJpJREFUSEvt
- 1M0Jg0AUBODFQlKAldiDNaQGu7KENJAO9OgtN0867zAgzoCgvCQHB77LMrsP/Nly56/SwAjLRXFGnCUZ
- wG04I86SuOIVEleiN8y7tSMSV6IOanht1o5IXIliQKSCJ3zA9bYkrkQcwDygB9cliSvRfgDTwgRuj8SV
- 6OsD0h5R6ktO/UzTf7QzJOmXXfp1fecXKWUFApMbphVBZLEAAAAASUVORK5CYII=
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAI1JREFUSEvt
+ lL0NQGAQQF8MYgCT2MEMZrCVESxgA0qdTkWukHy5OwpcKLzkNbzcJX4++PkSJTAC601lhswyDE58VZll
+ 0NFdDTpI7YHFuX6mQQepDVAAnXPvSIMOUmWBkAE1MDuN1qADb8FODrRO99iCnQqYnP77C8IeUehLDv1M
+ w3+0KxrCD7vw4/rnHTYCkxumUj0ExgAAAABJRU5ErkJggg==
@@ -24220,53 +24215,51 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKpSURBVDhPpZNbSFRRFIY3mXoam5ISlOjCQEJC9hT01IUi
- 6CFUxpwUKoUaNCJLS9AHo5CCoHIyUioLU3KsyKTwEl0gB1ORyvFS3s0SLNPULBl19GvpWIzjYws2++Gs
- 9a1/rf0fpU/pQHnEykuDGcsu9ttWZA0T8sBBUIGDlVanLbJ+KmMuxS0SmvCNq/sH8U5oxtQEYQ1wSO6E
- dkjuhtw+6B8Dkx2PhmY7K4qn8Y6pRjv2gc01sLUK9tQKoBHMHyGtA5Lk5H11QSLr3SGxtSy+P4l/sZPg
- imlCyqfZLoAw6X5QimMEEvEWMr7AeTlnejwhB96gCifRZE7D00mCSyfY+x6Wn+7C71wvQdk/CLAMoLsy
- RM4gXBCI9ZsLYng2A9n/ApX3Gy8B+D9yElA0TmApeJkbPWZV6i/k9neo/QnrymYAkeWoG/2om6NEt8DN
- ftdHYxssTfs0DxKUM8JyyxBry2GNFG98OY0KONWE4UwbhvRW1K4nqPBKvFJ70KXOL/6v8DnViUpsR28Z
- nN2FsWqK8EonpjpRoCKeos51odLbUWc70WJkqW6hpXRhkqVa5+aeudPFF5fFF5tKnZK704rKlR3kDqDu
- DqNF2RZI31Y0wjXZfpQ83eFmSO2S1+iF0GKH5O7IR139jLrWg8r6gir4OQtZZKxEF9+AZq7H94gdcyvs
- FnNFCyRe/DFjrJDCX65mS6JrRMFXVGa3CyJKvC0jeGcOoS4MEPJa5L4SgLg04h0cEdhxAazPH3VTayxF
- 3eoTJaImU3ZiEdC9CTSrg1Ul4xieONlSDRsejrHI3ETo4zEM2YPzx9Xi7C4F2b2uke5IQv44+pIpAp+D
- drQZ3YmW2SLdyVZWX5e9eYY+uT3DJ9ZuU/vEYFEVqMgyfGLf2fwSWxb8yn5JrfwBbwwPq6WONgkAAAAA
- SUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKfSURBVDhPpZNdSNNhFMYPmvZvtgwTkuiDQUGD8iroqg+K
+ oIsw0TSFyiCHRmTfYBdGMRKCypWkZBblyFmRRaEr+oAcmiPSTWe6tJlNsNaW2odMnfuFrsLNy87Ne/Ge
+ 83ue5/C+oj7Rg0TUgvM+/bxzHkvC5SG0d/0kGf0sMAUs6bYJfWSvSL6D2Xvf/IPE5HeQ6YCUNtjjgPxu
+ ONoLlQPgGYFMOxGCOjsJtUFisl+jHHjHmmZY1whbrbCnHXSdcLIHjvTAzc8hSLptOiTHyqw748yvDbDi
+ SRCtOciGRkhxwO5OyG6H1Legd8NZN5zqi4TsakKqx1GMfjSPx1lRN8a2Vog/7iLuTD9JZd9INHhRXRyk
+ 3AfFbjB9CUE0TychO58jN38RbfQz/36AxJpRFtZBtK59xnL/Qq5/Bet3WFY/CUg3I1c9SMUPsrqgwhO6
+ THsPc09+DIMklQ8TbxhkqRmW1MOqF0Ek8ZgDzan3aIqcyOZHyPYGogv7UBWGD/9XxR77gBR0ozb4pnaR
+ 1jjB9oYAmW+CiKQ+Rs64kKJu5PQHlOymMGXlhIvMVjD9yT15FvXChQFIrgsgssmEVHqQSi9yawglwzLD
+ +vqaYUrdkGGDfR1Q6ILiflhd60dkYxVy6RNS2odcdiPG71OQqLQGVHltKDobs3Pt6JywxQpZNsjrDD0s
+ bfXPkNicrGak8jNS0huC3BoixjBMTMkgUuxF+wqSX8KWZkhtgVwnHOyB5VU/prlNq0OuDSCln5ASF2Jw
+ I7fHUEx+Fj0cRfMowNrXsPLeCFE6B6sfjKAp84XHVfbaQw7K+kORbviQqlHUDydY+AyU/R2oDnVNDakO
+ O1l8xTtjX6I+2q2PzbFbZIcZyXiCpNcTm9NiiSvomvGV4444+Q1vDA+rs/f0rAAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEmSURBVDhPrZPLbYVADEXZpYI0kFIoALGmCERB7EAUQAdA
- Ca8GVuwQHykLnDkTPDLvoydFsWTN4Lm2ry8zkbXjOD5Y933/2rZNrBOzmAeb5/nTAW/rupZuzfq+lziO
- vQ/DQJHsPLuBPdN+TZPrupa2bWUcx++maUIB9sQ4A3MpAiVN1oSiKCRN0/CdJInkeR6+tUgYB2pUV8A7
- B0uOTz4Fy6Bou+B0xm0MdmDJ8cK6jXRdJ1VVXcBlWdLFO3uNMxqaIOyyLOIL6KE6hUjkDGd/zwSfpumf
- CkAHWlb5VyNQiHEZ249gRUQgBSr4vjNCX0TEXJe//8ZnF4kutjOjWXYPF+nZVWZOm0CMM01++R6g5tYM
- kbTA28ekppROYcNvxFWwQNtbFP0AMgZXy6yIKekAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZPBjYNADEVz2wrSQEqhAMSZIhAFcQNRAB0A
+ JaQGTtwQGGkPTPRGMTITokjZHclixtjf3388l4tZ27b98F3X9SYizho+G/Oypmm6ish9WZZCRNKu61wU
+ Rd76vgckff67E3uaXFWVa5rGDcPwW9f1DsAeH/+IOYBASZM1Ic9zlyTJfo7j2GVZtp8VZG8HaqBrwCcj
+ lhyf/BQshaKtopUx64MdseR4YVG4bVtXluUhuCgKqnhjr35aQxOEnefZeYCQIkAk6hWyD5lg4zj+EwB0
+ oGWVf9cCQLRL274FKyIChUzCygh9EPHP13g2SFSxlWnNsnsZpLNRpk+b8HaUdYWPCZEU4ONj0vXNc34A
+ MgZXy5S97UgAAAAASUVORK5CYII=
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGkSURBVDhPjZBPKARRHMfn7iQ3bo5OuFFEuXAhJ8kBkS2K
- HEhJ5CIH5eBPG0kSiTYrERstIaWVwh782V3T7C4tO7MzdofdeV874wm9p3zq0zu83+/zphG+sLl8qRaX
- qLTspjVPavtOIGY7iGqXUdJKR/k0bUqIxJNcbdtBNLsj+q1Oauk4S6MzYA3zGDwII2kQdO6LyhMhpXTl
- N3Urtwhr/EDvrmgFTAfcIf8bkE/XvqlZ8CIUS19xKJn0oG7xyrJnO2BJ176pnLmApPADP5ETSVTYL9hA
- +cQZJFmnY58Qev7EDFTZPWygeOwEopygYyxmzNQMVE6fsYHCETd8z3FrWKif42oSVHSUjR+zgbwhF7yP
- GvT0n1bfDa6JFMH9SwJFo242kNu3hXNJhfz+9xdE3wiun+IoGHaxgezudZwEYgjHCUQ1xTX0asAT1JDX
- v8UGsjpWsX8nw68a3NdNfbEUjh9U5PY42UBG6xL27hX4NeBGMbj60ndHooacrjU2IDTMY+rwARveFzgu
- I3BcsTq9z5g9lZDZtswJ1Nrxb6vnjM8lQfgA2uRd1Ro7IewAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGiSURBVDhPjY5NKARhHIfn7iQ3bnt0wo0iygUXOUkSZbNF
+ kQMpiVzkoBx8tJEkkWiz0oqNlpDSSmEPPnbXNLtLy87sjN1Zu/P+NMOKeV/lqadp6v97ZjjuC5v7NtPu
+ 5qX2PV4ynl927gbjtsOYchUj1uwtk7ZtAdFEmqltJ4QWT1S9U0mDefdNqzNoHLMYPowgrRF0H/DSMyEV
+ 5q1B49odIgo70L/HGwHdIU84kAKKzHuufsmHcDxl3hqUT3vRuHxt2LcTNDTvuZq5SwgSO/ATMZlGtf2S
+ DlRNnUMQ1V/H5NfbJ3qg1u6lA2UTp+DFpPn+Gz2mqwdqZs/pQMmYB/6XhHHMNS0w1QlJKionT+hA4Ygb
+ vicFqkYgv2tMkxmCh9ckSsc9dMAy4MKFIEN8//sPYimCm+cEikfddCC/dxOnwTgiCQJezjANv2nwhhQU
+ DrroQF7XOg7uRQRkjfpyVn88g5NHGZY+Jx3Isa5g/0FCQAFuJY2pXwGOeQUFPRt0gGtexMzRI7Z8r3Bc
+ ReG4pnX6XjB/JiC3Y5URaLDj39YtaNnZB7wMXcnioSxKAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADISURBVDhP3ZMxCgIxEEVzDxtvphfwBJ7GewiLjW3OoJVo
- ESw2KWNediKbcVDQzg8flvn/D8lk1mmklNbjOA4xxjwnNTSxTcg5y1cNLovRD6d7Xu0vebE7d6SGhgev
- xCZIOGwO15eg5vZ4o0nomtAVQZsbdF2a+BrmXhxNm2CDpZEh6xiOdedPJEOW45sG2GBpkOw/NHg3xAZL
- ew7x52cE5Sje2sIGXe8WCbCWpRCsbdQ0VxlIk+9+pjm4F8MpxjrlRmpoYhM49wDxYaZqILmlIAAAAABJ
- RU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC1SURBVDhPY2BAA9+/f0/4+vXr/m/fvv1HxiAxkByK4v//
+ /yNrVPj27dv5/Q8//o/f8+K/9MJHKBgkBpIDqQGpRTEIqvl97sFXGBrRcfWx1yBD3qMYAjIVJIGuGAbQ
+ xaGGnIfZngByGroifAaAMEgPOExAgYPNz4QwSA9IL8j5GJIwjM8FIAzSOxwMwBeI+AyAByLF0QhLSNhS
+ IS4DUBISclLGlhrRMdakjGQIeZkJGZCUnYEAAPFhpmpxZgdXAAAAAElFTkSuQmCC
diff --git a/OpenCV_CS/Form2.Designer.cs b/OpenCV_CS/Form2.Designer.cs
index 67d0540..d5f56d7 100644
--- a/OpenCV_CS/Form2.Designer.cs
+++ b/OpenCV_CS/Form2.Designer.cs
@@ -217,6 +217,7 @@ private void InitializeComponent()
this.checkBoxTemp = new System.Windows.Forms.CheckBox();
this.comboBoxReCodec = new System.Windows.Forms.ComboBox();
this.textBoxPGaddress = new System.Windows.Forms.TextBox();
+ this.textBoxMaxFPS = new System.Windows.Forms.TextBox();
this.button3 = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
this.groupBoxRSB = new System.Windows.Forms.GroupBox();
@@ -232,6 +233,7 @@ private void InitializeComponent()
this.checkBoxShift2 = new System.Windows.Forms.CheckBox();
this.checkBoxCtrl2 = new System.Windows.Forms.CheckBox();
this.label76 = new System.Windows.Forms.Label();
+ this.label89 = new System.Windows.Forms.Label();
this.tabControl.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.presetPictureBox1)).BeginInit();
@@ -497,6 +499,7 @@ private void InitializeComponent()
this.presetReso1.Name = "presetReso1";
this.presetReso1.Size = new System.Drawing.Size(121, 20);
this.presetReso1.TabIndex = 3;
+ this.presetReso1.SelectedIndexChanged += new System.EventHandler(this.presetReso1_SelectedIndexChanged);
//
// presetDevice1
//
@@ -741,6 +744,7 @@ private void InitializeComponent()
this.presetReso2.Name = "presetReso2";
this.presetReso2.Size = new System.Drawing.Size(121, 20);
this.presetReso2.TabIndex = 3;
+ this.presetReso2.SelectedIndexChanged += new System.EventHandler(this.presetReso2_SelectedIndexChanged);
//
// presetDevice2
//
@@ -982,6 +986,7 @@ private void InitializeComponent()
this.presetReso3.Name = "presetReso3";
this.presetReso3.Size = new System.Drawing.Size(121, 20);
this.presetReso3.TabIndex = 3;
+ this.presetReso3.SelectedIndexChanged += new System.EventHandler(this.presetReso3_SelectedIndexChanged);
//
// presetDevice3
//
@@ -1224,6 +1229,7 @@ private void InitializeComponent()
this.presetReso4.Name = "presetReso4";
this.presetReso4.Size = new System.Drawing.Size(121, 20);
this.presetReso4.TabIndex = 3;
+ this.presetReso4.SelectedIndexChanged += new System.EventHandler(this.presetReso4_SelectedIndexChanged);
//
// presetDevice4
//
@@ -1467,6 +1473,7 @@ private void InitializeComponent()
this.presetReso5.Name = "presetReso5";
this.presetReso5.Size = new System.Drawing.Size(121, 20);
this.presetReso5.TabIndex = 49;
+ this.presetReso5.SelectedIndexChanged += new System.EventHandler(this.presetReso5_SelectedIndexChanged);
//
// presetDevice5
//
@@ -1710,6 +1717,7 @@ private void InitializeComponent()
this.presetReso6.Name = "presetReso6";
this.presetReso6.Size = new System.Drawing.Size(121, 20);
this.presetReso6.TabIndex = 73;
+ this.presetReso6.SelectedIndexChanged += new System.EventHandler(this.presetReso6_SelectedIndexChanged);
//
// presetDevice6
//
@@ -2045,6 +2053,14 @@ private void InitializeComponent()
this.toolTip1.SetToolTip(this.textBoxPGaddress, "PostgreSQLのかどうしているサーバーIPアドレスを指定");
this.textBoxPGaddress.Leave += new System.EventHandler(this.textBoxPGaddress_Leave);
//
+ // textBoxMaxFPS
+ //
+ this.textBoxMaxFPS.Location = new System.Drawing.Point(479, 15);
+ this.textBoxMaxFPS.Name = "textBoxMaxFPS";
+ this.textBoxMaxFPS.Size = new System.Drawing.Size(33, 19);
+ this.textBoxMaxFPS.TabIndex = 45;
+ this.toolTip1.SetToolTip(this.textBoxMaxFPS, "プレビューや録画するフレームを間引きます。");
+ //
// button3
//
this.button3.Location = new System.Drawing.Point(382, 17);
@@ -2225,11 +2241,22 @@ private void InitializeComponent()
this.label76.TabIndex = 41;
this.label76.Text = "取込開始キー";
//
+ // label89
+ //
+ this.label89.AutoSize = true;
+ this.label89.Location = new System.Drawing.Point(359, 18);
+ this.label89.Name = "label89";
+ this.label89.Size = new System.Drawing.Size(117, 12);
+ this.label89.TabIndex = 46;
+ this.label89.Text = "上限FPS(0で制限なし)";
+ //
// Form2
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(676, 765);
+ this.Controls.Add(this.label89);
+ this.Controls.Add(this.textBoxMaxFPS);
this.Controls.Add(this.label75);
this.Controls.Add(this.textBoxChar2);
this.Controls.Add(this.checkBoxShift2);
@@ -2488,5 +2515,7 @@ private void InitializeComponent()
private System.Windows.Forms.Label label86;
private System.Windows.Forms.Label label87;
private System.Windows.Forms.Label label88;
+ private System.Windows.Forms.TextBox textBoxMaxFPS;
+ private System.Windows.Forms.Label label89;
}
}
\ No newline at end of file
diff --git a/OpenCV_CS/Form2.cs b/OpenCV_CS/Form2.cs
index 40b532d..df42f56 100644
--- a/OpenCV_CS/Form2.cs
+++ b/OpenCV_CS/Form2.cs
@@ -49,10 +49,22 @@ private void initForm()
this.textBox1.Text = Properties.Settings.Default.outdir;
this.textBox2.Text = Properties.Settings.Default.tmpdir;
this.comboCodecs.Items.Clear();
- this.comboCodecs.Items.AddRange(new object[] { "raw", "MJPG", "XVID", "DIVX", "MP4V", "H264" });
- int index = comboCodecs.Items.IndexOf(Properties.Settings.Default.codec);
+ this.comboCodecs.Items.AddRange(new object[] { "raw", "MJPG", "XVID", "DIVX", "mp4v", "H264" });
+
+ //Codec nameが変更
+ string orgCodec = Properties.Settings.Default.codec;
+ if (orgCodec == "MP4V")
+ {
+ orgCodec = "mp4v";
+ Properties.Settings.Default.codec = "mp4v";
+ Properties.Settings.Default.Save();
+ }
+
+ int index = comboCodecs.Items.IndexOf(orgCodec);
comboCodecs.SelectedIndex = index;
+ textBoxMaxFPS.Text = Properties.Settings.Default.maxfps.ToString();
+
comboBoxReCodec.Items.Clear();
comboBoxReCodec.Items.Add("libxvid");
comboBoxReCodec.Items.Add("libx264");
@@ -383,6 +395,7 @@ private void buttonClose_Click(object sender, EventArgs e)
Properties.Settings.Default.timeout = (int)numericUpDownTimeout.Value;
Properties.Settings.Default.pgaddress = textBoxPGaddress.Text;
+ Properties.Settings.Default.maxfps = int.Parse(textBoxMaxFPS.Text);
Properties.Settings.Default.Save();
this.DialogResult = DialogResult.OK;
@@ -771,11 +784,16 @@ private void presetDevice1_SelectedIndexChanged(object sender, EventArgs e)
i++;
} while (i < 127);
- if (i > 0)
+ if (i > Properties.Settings.Default.reso1)
{
presetReso1.SelectedIndex = Properties.Settings.Default.reso1;
PresetReady[1] = true;
}
+ else if (i > 0)
+ {
+ presetReso1.SelectedIndex = 0;
+ PresetReady[1] = true;
+ }
else
{
MessageBox.Show("設定時に存在したデバイスが取り外されているようです。Preset1の設定はスキップされます。");
@@ -803,11 +821,16 @@ private void presetDevice2_SelectedIndexChanged(object sender, EventArgs e)
i++;
} while (i < 127);
- if (i > 0)
+ if (i > Properties.Settings.Default.reso2)
{
presetReso2.SelectedIndex = Properties.Settings.Default.reso2;
PresetReady[2] = true;
}
+ else if (i > 0)
+ {
+ presetReso2.SelectedIndex = 0;
+ PresetReady[2] = true;
+ }
else
{
MessageBox.Show("設定時に存在したデバイスが取り外されているようです。Preset2の設定はスキップされます。");
@@ -835,9 +858,14 @@ private void presetDevice3_SelectedIndexChanged(object sender, EventArgs e)
i++;
} while (i < 127);
- if (i > 0)
+ if (i > Properties.Settings.Default.reso3)
+ {
+ presetReso3.SelectedIndex = Properties.Settings.Default.reso1;
+ PresetReady[3] = true;
+ }
+ else if (i > 0)
{
- presetReso3.SelectedIndex = Properties.Settings.Default.reso3;
+ presetReso3.SelectedIndex = 0;
PresetReady[3] = true;
}
else
@@ -867,11 +895,16 @@ private void presetDevice4_SelectedIndexChanged(object sender, EventArgs e)
i++;
} while (i < 127);
- if (i > 0)
+ if (i > Properties.Settings.Default.reso4)
{
presetReso4.SelectedIndex = Properties.Settings.Default.reso4;
PresetReady[4] = true;
}
+ else if (i > 0)
+ {
+ presetReso4.SelectedIndex = 0;
+ PresetReady[4] = true;
+ }
else
{
MessageBox.Show("設定時に存在したデバイスが取り外されているようです。Preset4の設定はスキップされます。");
@@ -899,14 +932,19 @@ private void presetDevice5_SelectedIndexChanged(object sender, EventArgs e)
i++;
} while (i < 127);
- if (i > 0)
+ if (i > Properties.Settings.Default.reso5)
{
presetReso5.SelectedIndex = Properties.Settings.Default.reso5;
PresetReady[5] = true;
}
+ else if (i > 0)
+ {
+ presetReso5.SelectedIndex = 0;
+ PresetReady[5] = true;
+ }
else
{
- MessageBox.Show("設定時に存在したデバイスが取り外されているようです。Preset5の設定はスキップされます。");
+ MessageBox.Show("設定時に存在したデバイスが取り外されているようです。Preset6の設定はスキップされます。");
}
}
catch (Exception ex)
@@ -997,11 +1035,16 @@ private void presetDevice6_SelectedIndexChanged(object sender, EventArgs e)
i++;
} while (i < 127);
- if (i > 0)
+ if (i > Properties.Settings.Default.reso6)
{
presetReso6.SelectedIndex = Properties.Settings.Default.reso6;
PresetReady[6] = true;
}
+ else if (i > 0)
+ {
+ presetReso6.SelectedIndex = 0;
+ PresetReady[6] = true;
+ }
else
{
MessageBox.Show("設定時に存在したデバイスが取り外されているようです。Preset6の設定はスキップされます。");
@@ -1013,6 +1056,36 @@ private void presetDevice6_SelectedIndexChanged(object sender, EventArgs e)
}
}
+ private void presetReso5_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ PresetReady[5] = true;
+ }
+
+ private void presetReso1_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ PresetReady[1] = true;
+ }
+
+ private void presetReso2_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ PresetReady[2] = true;
+ }
+
+ private void presetReso3_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ PresetReady[3] = true;
+ }
+
+ private void presetReso4_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ PresetReady[4] = true;
+ }
+
+ private void presetReso6_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ PresetReady[6] = true;
+ }
+
private void textBoxChar2_KeyDown(object sender, KeyEventArgs e)
{
this.textBoxChar2.Text = e.KeyCode.ToString();
diff --git a/OpenCV_CS/Form2.resx b/OpenCV_CS/Form2.resx
index cc90693..3ef3bb6 100644
--- a/OpenCV_CS/Form2.resx
+++ b/OpenCV_CS/Form2.resx
@@ -123,9 +123,6 @@
17, 17
-
- 442, 17
-
文字を書き込む左上座標、フォントサイズ、カラーコード(16進RGB)、文字列
の並びでカンマ区切りで入力してください。
@@ -136,6 +133,9 @@
55,890,12,808080,Yuki ENT clinic,60,200,16,808080,$d $t, 60, 240,18,808080, $i,60,300,18,808080,$n
+
+ 442, 17
+
文字を書き込む左上座標、フォントサイズ、カラーコード(16進RGB)、文字列
の並びでカンマ区切りで入力してください。
@@ -189,7 +189,7 @@
302, 17
- 37
+ 25
diff --git a/OpenCV_CS/Form5.cs b/OpenCV_CS/Form5.cs
index 9125aa6..f1b12da 100644
--- a/OpenCV_CS/Form5.cs
+++ b/OpenCV_CS/Form5.cs
@@ -34,21 +34,33 @@ private async void ShowBmp(Bitmap bmp, int bmpWidth, int bmpHeight)
{
try
{
+ formMain.lockOutbmp = true;
+
//this.Size = new Size(bmp.Width, bmp.Height);
picWidth = bmpWidth;
picHeight = bmpHeight;
if (bmp != null)
{
- await Task.Run(() =>
- {
- DrawBmp(bmp, zoom);
- });
+ Bitmap resizedBmp = await Task.Run(() => ProcessBmp(bmp));
+ //Bitmap resizedBmp = ProcessBmp(bmp);
+ await UpdatePictureBox(resizedBmp);
+ //Task.Run(() =>
+ //{
+ // DrawBmp(bmp, zoom);
+ //});
+
}
}
catch (Exception ex)
{
- MessageBox.Show(ex.ToString());
+ formMain.LogError(ex);
+ //MessageBox.Show(ex.ToString());
+ formMain.PauseReloadFlag = true;
+ }
+ finally
+ {
+ formMain.lockOutbmp = false;
}
}
@@ -71,44 +83,88 @@ private void pictureBox1_MouseWheel(object sender, MouseEventArgs e)
formMain.PauseReloadFlag = true;
}
- private void DrawBmp(Bitmap bmp, int zoom) //Zoom:mouse wheel delta
+ private async Task UpdatePictureBox(Bitmap resizedBmp)
+ {
+ if (resizedBmp == null) return;
+
+ var oldimg = pictureBox1.Image;
+ pictureBox1.BeginInvoke((Action)(() =>
+ {
+ pictureBox1.Image = resizedBmp;
+ oldimg?.Dispose();
+
+ }));
+ // メモリ解放のチェック
+ await Task.Delay(1); // 必要に応じて間隔を調整
+ }
+
+ //private void DrawBmp(Bitmap bmp, int zoom) //Zoom:mouse wheel delta
+ //{
+ // Bitmap resizedBmp = null;
+ // try
+ // {
+ // if (bmp != null)
+ // {
+ // formMain.lockOutbmp = true;
+
+ // using (Mat srcmat = bmp.ToMat())
+ // using (Mat dstmat = new Mat())
+ // {
+ // var dstSize = new OpenCvSharp.Size(picWidth * zoom / 8, picHeight * zoom / 8);
+
+ // Cv2.Resize(srcmat, dstmat, dstSize, 0, 0, InterpolationFlags.Lanczos4);
+ // resizedBmp = dstmat.ToBitmap();
+ // }
+
+ // var oldimg = pictureBox1.Image;
+ // // UIスレッドに戻す
+ // this.BeginInvoke((Action)(() =>
+ // {
+ // // UIスレッドでpictureBox1.Imageにアクセス
+ // pictureBox1.Image = resizedBmp;
+ // oldimg?.Dispose();
+ // }));
+
+ // }
+ // }
+ // catch(Exception ex)
+ // {
+ // MessageBox.Show(ex.ToString());
+ // //MessageBox.Show("拡大表示時にエラーが発生しました");
+ // }
+ // finally {
+ // formMain.lockOutbmp = false;
+
+ // }
+ //}
+
+ private Bitmap ProcessBmp(Bitmap bmp)
{
- Bitmap resizedBmp;
try
{
- if (bmp != null)
+ Bitmap resizedBmp;
+ if (bmp == null)
+ {
+ formMain.PauseReloadFlag = true;
+ resizedBmp = null;
+ }
+ else
{
- formMain.lockOutbmp = true;
-
using (Mat srcmat = bmp.ToMat())
using (Mat dstmat = new Mat())
{
var dstSize = new OpenCvSharp.Size(picWidth * zoom / 8, picHeight * zoom / 8);
-
Cv2.Resize(srcmat, dstmat, dstSize, 0, 0, InterpolationFlags.Lanczos4);
resizedBmp = dstmat.ToBitmap();
}
-
- var oldimg = pictureBox1.Image;
- // UIスレッドに戻す
- this.Invoke((Action)(() =>
- {
- // UIスレッドでpictureBox1.Imageにアクセス
- pictureBox1.Image = (Image)resizedBmp;
- }));
-
- oldimg?.Dispose();
- //resizedBmp.Dispose();
-
}
+ return resizedBmp;
}
- catch(Exception)
+ catch (Exception ex)
{
- //MessageBox.Show(ex.ToString());
- //MessageBox.Show("拡大表示時にエラーが発生しました");
- }
- finally {
- formMain.lockOutbmp = false;
+ formMain.LogError(ex);
+ formMain.PauseReloadFlag = true;
+ return null;
}
}
diff --git a/OpenCV_CS/Properties/AssemblyInfo.cs b/OpenCV_CS/Properties/AssemblyInfo.cs
index 8ab9838..d5ea81e 100644
--- a/OpenCV_CS/Properties/AssemblyInfo.cs
+++ b/OpenCV_CS/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
// すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
// 既定値にすることができます:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.24.6.13")]
-[assembly: AssemblyFileVersion("1.24.6.13")]
+[assembly: AssemblyVersion("1.24.11.8")]
+[assembly: AssemblyFileVersion("1.24.11.8")]
[assembly: NeutralResourcesLanguage("ja-JP")]
diff --git a/OpenCV_CS/Properties/Resources.Designer.cs b/OpenCV_CS/Properties/Resources.Designer.cs
index 5b8c1ee..2c1cf7c 100644
--- a/OpenCV_CS/Properties/Resources.Designer.cs
+++ b/OpenCV_CS/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace ENTcapture.Properties {
// または Visual Studio のようなツールを使用して自動生成されました。
// メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に
// ResGen を実行し直すか、または VS プロジェクトをビルドし直します。
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
diff --git a/OpenCV_CS/Properties/Settings.Designer.cs b/OpenCV_CS/Properties/Settings.Designer.cs
index 5415e21..a8e78b8 100644
--- a/OpenCV_CS/Properties/Settings.Designer.cs
+++ b/OpenCV_CS/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace ENTcapture.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.11.0.0")]
public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -922,5 +922,17 @@ public int FPS6 {
this["FPS6"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("0")]
+ public int maxfps {
+ get {
+ return ((int)(this["maxfps"]));
+ }
+ set {
+ this["maxfps"] = value;
+ }
+ }
}
}
diff --git a/OpenCV_CS/Properties/Settings.settings b/OpenCV_CS/Properties/Settings.settings
index 1f2cd1e..35aa2b9 100644
--- a/OpenCV_CS/Properties/Settings.settings
+++ b/OpenCV_CS/Properties/Settings.settings
@@ -227,5 +227,8 @@
0
+
+ 0
+
\ No newline at end of file
diff --git a/OpenCV_CS/openh264-1.8.0-win64.dll b/OpenCV_CS/openh264-1.8.0-win64.dll
new file mode 100644
index 0000000..99fb7b2
Binary files /dev/null and b/OpenCV_CS/openh264-1.8.0-win64.dll differ
diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj
index 9c86e91..45018e3 100644
--- a/Setup/Setup.vdproj
+++ b/Setup/Setup.vdproj
@@ -15,800 +15,866 @@
{
"Entry"
{
- "MsmKey" = "8:_021E13A20FE7DD9D704A86A6B2C25A4E"
- "OwnerKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "MsmKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_021E13A20FE7DD9D704A86A6B2C25A4E"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_0EE6987F697D10D2D01D484B5048F7E8"
+ "OwnerKey" = "8:_FE0C642F2E354DEBAB2A5611EB8DBADF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_0C0DBB1CB162F4FF44EB4F1EF84F806B"
- "OwnerKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "MsmKey" = "8:_192F1D3F9CDD4C2CA0D2DF786A8F870C"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_1C441FD8EE84252FBCFB7BBCF2A4B1BF"
+ "OwnerKey" = "8:_C98E750DC9BF2A9012E5533F75B173BD"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_1C441FD8EE84252FBCFB7BBCF2A4B1BF"
+ "OwnerKey" = "8:_912F92AA4EA51238D25AD70707B09879"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_1C441FD8EE84252FBCFB7BBCF2A4B1BF"
+ "OwnerKey" = "8:_DAB88F3754B3472773A36BF9200C7E84"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_0C0DBB1CB162F4FF44EB4F1EF84F806B"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_205C1E495DCCCD8ABD26447A128EA2AC"
+ "OwnerKey" = "8:_CFC629C1253E8782D7D9F255953993D1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_0F9EC7B0F06B433C8FCE1072DAF7E6F4"
+ "MsmKey" = "8:_23FFFD358C644D5B84FF5FE82CD5F2A9"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_116D4F582206CAC904A7CC28C68406F6"
- "OwnerKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "MsmKey" = "8:_3F153E524AF018252A8A650243B22F79"
+ "OwnerKey" = "8:_73E571AA7490969BDDA6694F02C608B6"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_116D4F582206CAC904A7CC28C68406F6"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_40BF96A9A752402088BB2F171772F59F"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1227ACAE79530932DBE95EAE8A81A6A3"
- "OwnerKey" = "8:_8388FBAB54C00B61D25222B7722A14FC"
+ "MsmKey" = "8:_420573D8FAD5EB35642557A6FFFC9726"
+ "OwnerKey" = "8:_D2E1EFCC41C2B1D302666F750070B925"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1227ACAE79530932DBE95EAE8A81A6A3"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_420573D8FAD5EB35642557A6FFFC9726"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1227ACAE79530932DBE95EAE8A81A6A3"
- "OwnerKey" = "8:_AA88AA60956A2B7AAA3198CCC46A8B71"
+ "MsmKey" = "8:_420573D8FAD5EB35642557A6FFFC9726"
+ "OwnerKey" = "8:_70E8D2F25248403155E063694C68FCC3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1227ACAE79530932DBE95EAE8A81A6A3"
- "OwnerKey" = "8:_48C2CFF3A224AB99DE828B3CDA8965C7"
+ "MsmKey" = "8:_420573D8FAD5EB35642557A6FFFC9726"
+ "OwnerKey" = "8:_CFC629C1253E8782D7D9F255953993D1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1227ACAE79530932DBE95EAE8A81A6A3"
- "OwnerKey" = "8:_116D4F582206CAC904A7CC28C68406F6"
+ "MsmKey" = "8:_420573D8FAD5EB35642557A6FFFC9726"
+ "OwnerKey" = "8:_3F153E524AF018252A8A650243B22F79"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1227ACAE79530932DBE95EAE8A81A6A3"
- "OwnerKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "MsmKey" = "8:_4326A741A8462642E1145BF329685FD9"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1227ACAE79530932DBE95EAE8A81A6A3"
- "OwnerKey" = "8:_0C0DBB1CB162F4FF44EB4F1EF84F806B"
+ "MsmKey" = "8:_441A01E69AA74C3C9CF056C53AE7D9E8"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1227ACAE79530932DBE95EAE8A81A6A3"
- "OwnerKey" = "8:_021E13A20FE7DD9D704A86A6B2C25A4E"
+ "MsmKey" = "8:_48B63F68326C44D99E930B9E43A8122C"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_125B86AFF0026E9BD08A3F56E5B2E550"
- "OwnerKey" = "8:_021E13A20FE7DD9D704A86A6B2C25A4E"
+ "MsmKey" = "8:_493006B8F0C587C5A5A781A99FFD331F"
+ "OwnerKey" = "8:_441A01E69AA74C3C9CF056C53AE7D9E8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_125B86AFF0026E9BD08A3F56E5B2E550"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_493006B8F0C587C5A5A781A99FFD331F"
+ "OwnerKey" = "8:_A0364BE02C0DA86A1BC575C7758152D1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_125B86AFF0026E9BD08A3F56E5B2E550"
- "OwnerKey" = "8:_AA88AA60956A2B7AAA3198CCC46A8B71"
+ "MsmKey" = "8:_493006B8F0C587C5A5A781A99FFD331F"
+ "OwnerKey" = "8:_FE0C642F2E354DEBAB2A5611EB8DBADF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_125B86AFF0026E9BD08A3F56E5B2E550"
- "OwnerKey" = "8:_48C2CFF3A224AB99DE828B3CDA8965C7"
+ "MsmKey" = "8:_493006B8F0C587C5A5A781A99FFD331F"
+ "OwnerKey" = "8:_48B63F68326C44D99E930B9E43A8122C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_125B86AFF0026E9BD08A3F56E5B2E550"
- "OwnerKey" = "8:_116D4F582206CAC904A7CC28C68406F6"
+ "MsmKey" = "8:_4A21ACD373B647BD8E39FA0C1E2A92D6"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_125B86AFF0026E9BD08A3F56E5B2E550"
- "OwnerKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "MsmKey" = "8:_51F22015B23E4CE197F50F03349E4BD8"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_125B86AFF0026E9BD08A3F56E5B2E550"
- "OwnerKey" = "8:_0C0DBB1CB162F4FF44EB4F1EF84F806B"
+ "MsmKey" = "8:_5E6B288C33C0435C8DBCC8C81FE3A834"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_14E0C3A8EB137A30AE332CBA2BE9453F"
- "OwnerKey" = "8:_61C126C5476411D56039CE2B09EC03E3"
+ "MsmKey" = "8:_6335BFBF099449C993FA711B48E361C5"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_14E0C3A8EB137A30AE332CBA2BE9453F"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_638F6778A97281D9473464A25C75531B"
+ "OwnerKey" = "8:_493006B8F0C587C5A5A781A99FFD331F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_14E0C3A8EB137A30AE332CBA2BE9453F"
- "OwnerKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "MsmKey" = "8:_638F6778A97281D9473464A25C75531B"
+ "OwnerKey" = "8:_C55D1B5DD6E93C23FAC3CB232D4B7CC2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_14E0C3A8EB137A30AE332CBA2BE9453F"
- "OwnerKey" = "8:_D5E7AF890D491C291D523A7925A7CAFD"
+ "MsmKey" = "8:_638F6778A97281D9473464A25C75531B"
+ "OwnerKey" = "8:_CFC629C1253E8782D7D9F255953993D1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_14E0C3A8EB137A30AE332CBA2BE9453F"
- "OwnerKey" = "8:_116D4F582206CAC904A7CC28C68406F6"
+ "MsmKey" = "8:_638F6778A97281D9473464A25C75531B"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_14E0C3A8EB137A30AE332CBA2BE9453F"
- "OwnerKey" = "8:_61528F119D53B38DFB9BB04873B47A49"
+ "MsmKey" = "8:_638F6778A97281D9473464A25C75531B"
+ "OwnerKey" = "8:_B27E251D86925B0F110BD31DAFB2CEF3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_35EB187B8F1CFB1EFF16C56A6AD6C2C6"
- "OwnerKey" = "8:_1227ACAE79530932DBE95EAE8A81A6A3"
+ "MsmKey" = "8:_638F6778A97281D9473464A25C75531B"
+ "OwnerKey" = "8:_DB393853A0CAE22441FB3507BADEDA0C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_35EB187B8F1CFB1EFF16C56A6AD6C2C6"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_638F6778A97281D9473464A25C75531B"
+ "OwnerKey" = "8:_73E571AA7490969BDDA6694F02C608B6"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_35EB187B8F1CFB1EFF16C56A6AD6C2C6"
- "OwnerKey" = "8:_116D4F582206CAC904A7CC28C68406F6"
+ "MsmKey" = "8:_638F6778A97281D9473464A25C75531B"
+ "OwnerKey" = "8:_DCF038FB05564F838D3B7BC2FF0DFB00"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_3CFCE5936DE46644A11496579247127C"
- "OwnerKey" = "8:_B2F6067BC7CB389369D6EE32DE429E0B"
+ "MsmKey" = "8:_6672410B499E293D1F8A4694F307D506"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_3CFCE5936DE46644A11496579247127C"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_69AB6FEAB79F55BE04BEF8CE1318AE61"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4326A741A8462642E1145BF329685FD9"
- "OwnerKey" = "8:_B7E6A520AA7A53D613CE1CFC9B4BF350"
+ "MsmKey" = "8:_6E8E41FFBA48C94F92F93FAADFF8B06C"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46CFD1C439C942A3A5B4DE3A14F78B23"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_70E8D2F25248403155E063694C68FCC3"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_48C2CFF3A224AB99DE828B3CDA8965C7"
- "OwnerKey" = "8:_116D4F582206CAC904A7CC28C68406F6"
+ "MsmKey" = "8:_73E571AA7490969BDDA6694F02C608B6"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_48C2CFF3A224AB99DE828B3CDA8965C7"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_8894EBEF178AE4CAA2B5B9019BC8C290"
+ "OwnerKey" = "8:_638F6778A97281D9473464A25C75531B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_51F22015B23E4CE197F50F03349E4BD8"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_8894EBEF178AE4CAA2B5B9019BC8C290"
+ "OwnerKey" = "8:_C55D1B5DD6E93C23FAC3CB232D4B7CC2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5F35FBC60EFDFF28DB83904C13363275"
- "OwnerKey" = "8:_116D4F582206CAC904A7CC28C68406F6"
+ "MsmKey" = "8:_8894EBEF178AE4CAA2B5B9019BC8C290"
+ "OwnerKey" = "8:_CFC629C1253E8782D7D9F255953993D1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5F35FBC60EFDFF28DB83904C13363275"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_8894EBEF178AE4CAA2B5B9019BC8C290"
+ "OwnerKey" = "8:_DB393853A0CAE22441FB3507BADEDA0C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_61528F119D53B38DFB9BB04873B47A49"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_8894EBEF178AE4CAA2B5B9019BC8C290"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_61528F119D53B38DFB9BB04873B47A49"
- "OwnerKey" = "8:_8388FBAB54C00B61D25222B7722A14FC"
+ "MsmKey" = "8:_8894EBEF178AE4CAA2B5B9019BC8C290"
+ "OwnerKey" = "8:_73E571AA7490969BDDA6694F02C608B6"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_61C126C5476411D56039CE2B09EC03E3"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_8C340FF38D0446B9BF2C181E989C9864"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_61C126C5476411D56039CE2B09EC03E3"
- "OwnerKey" = "8:_116D4F582206CAC904A7CC28C68406F6"
+ "MsmKey" = "8:_912F92AA4EA51238D25AD70707B09879"
+ "OwnerKey" = "8:_C98E750DC9BF2A9012E5533F75B173BD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_61C126C5476411D56039CE2B09EC03E3"
- "OwnerKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "MsmKey" = "8:_A0364BE02C0DA86A1BC575C7758152D1"
+ "OwnerKey" = "8:_FE0C642F2E354DEBAB2A5611EB8DBADF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_61C126C5476411D56039CE2B09EC03E3"
- "OwnerKey" = "8:_61528F119D53B38DFB9BB04873B47A49"
+ "MsmKey" = "8:_AD6B71F1069D0C297AF557CF1FEABECD"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6335BFBF099449C993FA711B48E361C5"
+ "MsmKey" = "8:_ADFE838C5CD44E878860FDD6DE00B079"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_7A7C03EB5C7CBE693182A5E1345CFF6F"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
+ "OwnerKey" = "8:_FE0C642F2E354DEBAB2A5611EB8DBADF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_7C096072C24B4A2D98D062A3681C55A8"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_B27E251D86925B0F110BD31DAFB2CEF3"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8388FBAB54C00B61D25222B7722A14FC"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_B6CAA1441407196C91BD4E12E84F8504"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8388FBAB54C00B61D25222B7722A14FC"
- "OwnerKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "MsmKey" = "8:_B7E7B9EAF6306AB68365DB69CF16F7A5"
+ "OwnerKey" = "8:_638F6778A97281D9473464A25C75531B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_89201382210B42118C426696FE51E718"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_B7E7B9EAF6306AB68365DB69CF16F7A5"
+ "OwnerKey" = "8:_CFC629C1253E8782D7D9F255953993D1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_B8ADA632090ABB2B34E2F7FEB4A7D615"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A00B5E31F3254BD39E9894075ED56CC5"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
+ "OwnerKey" = "8:_DAB88F3754B3472773A36BF9200C7E84"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A09EEE10C4D8EDFDF9878D0996951271"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A09EEE10C4D8EDFDF9878D0996951271"
- "OwnerKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "MsmKey" = "8:_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
+ "OwnerKey" = "8:_4326A741A8462642E1145BF329685FD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A11580013C2A7A2BDF97F82F62526014"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_C55D1B5DD6E93C23FAC3CB232D4B7CC2"
+ "OwnerKey" = "8:_CFC629C1253E8782D7D9F255953993D1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_AA88AA60956A2B7AAA3198CCC46A8B71"
- "OwnerKey" = "8:_7A7C03EB5C7CBE693182A5E1345CFF6F"
+ "MsmKey" = "8:_C98E750DC9BF2A9012E5533F75B173BD"
+ "OwnerKey" = "8:_FE0C642F2E354DEBAB2A5611EB8DBADF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_AA88AA60956A2B7AAA3198CCC46A8B71"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_CFC629C1253E8782D7D9F255953993D1"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_ADFE838C5CD44E878860FDD6DE00B079"
+ "MsmKey" = "8:_D2E1EFCC41C2B1D302666F750070B925"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_D2E1EFCC41C2B1D302666F750070B925"
+ "OwnerKey" = "8:_CFC629C1253E8782D7D9F255953993D1"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_D2E1EFCC41C2B1D302666F750070B925"
+ "OwnerKey" = "8:_3F153E524AF018252A8A650243B22F79"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_D4529EEBD156454CAB6D653B05DF0671"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B012C0E4C87990DA2E82471C97DE5059"
- "OwnerKey" = "8:_7A7C03EB5C7CBE693182A5E1345CFF6F"
+ "MsmKey" = "8:_D57CC0AC6BEF0A9AB4E224E0822DD072"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B012C0E4C87990DA2E82471C97DE5059"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_D8663E8561E29776603567AA70FFDA4A"
+ "OwnerKey" = "8:_638F6778A97281D9473464A25C75531B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B2F6067BC7CB389369D6EE32DE429E0B"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_D8663E8561E29776603567AA70FFDA4A"
+ "OwnerKey" = "8:_C55D1B5DD6E93C23FAC3CB232D4B7CC2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B7E6A520AA7A53D613CE1CFC9B4BF350"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_D8663E8561E29776603567AA70FFDA4A"
+ "OwnerKey" = "8:_CFC629C1253E8782D7D9F255953993D1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B7E6A520AA7A53D613CE1CFC9B4BF350"
- "OwnerKey" = "8:_AA88AA60956A2B7AAA3198CCC46A8B71"
+ "MsmKey" = "8:_D8663E8561E29776603567AA70FFDA4A"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B7E6A520AA7A53D613CE1CFC9B4BF350"
- "OwnerKey" = "8:_7A7C03EB5C7CBE693182A5E1345CFF6F"
+ "MsmKey" = "8:_D8663E8561E29776603567AA70FFDA4A"
+ "OwnerKey" = "8:_B27E251D86925B0F110BD31DAFB2CEF3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B7E6A520AA7A53D613CE1CFC9B4BF350"
- "OwnerKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "MsmKey" = "8:_D8663E8561E29776603567AA70FFDA4A"
+ "OwnerKey" = "8:_DB393853A0CAE22441FB3507BADEDA0C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B8ADA632090ABB2B34E2F7FEB4A7D615"
- "OwnerKey" = "8:_B7E6A520AA7A53D613CE1CFC9B4BF350"
+ "MsmKey" = "8:_D8663E8561E29776603567AA70FFDA4A"
+ "OwnerKey" = "8:_420573D8FAD5EB35642557A6FFFC9726"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_BA7099657E8F99C2A08625CAA19478A2"
- "OwnerKey" = "8:_B2F6067BC7CB389369D6EE32DE429E0B"
+ "MsmKey" = "8:_D8663E8561E29776603567AA70FFDA4A"
+ "OwnerKey" = "8:_DCF038FB05564F838D3B7BC2FF0DFB00"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_BA7099657E8F99C2A08625CAA19478A2"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_D8663E8561E29776603567AA70FFDA4A"
+ "OwnerKey" = "8:_493006B8F0C587C5A5A781A99FFD331F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_BA7099657E8F99C2A08625CAA19478A2"
- "OwnerKey" = "8:_3CFCE5936DE46644A11496579247127C"
+ "MsmKey" = "8:_DA1FAA642B43AE6E5808C9BB4B524476"
+ "OwnerKey" = "8:_0EE6987F697D10D2D01D484B5048F7E8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_BA7099657E8F99C2A08625CAA19478A2"
- "OwnerKey" = "8:_C491653DD3D812134973352698CA5CD6"
+ "MsmKey" = "8:_DA1FAA642B43AE6E5808C9BB4B524476"
+ "OwnerKey" = "8:_FE0C642F2E354DEBAB2A5611EB8DBADF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
- "OwnerKey" = "8:_4326A741A8462642E1145BF329685FD9"
+ "MsmKey" = "8:_DAB88F3754B3472773A36BF9200C7E84"
+ "OwnerKey" = "8:_C98E750DC9BF2A9012E5533F75B173BD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
- "OwnerKey" = "8:_C491653DD3D812134973352698CA5CD6"
+ "MsmKey" = "8:_DAB88F3754B3472773A36BF9200C7E84"
+ "OwnerKey" = "8:_912F92AA4EA51238D25AD70707B09879"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
- "OwnerKey" = "8:_B7E6A520AA7A53D613CE1CFC9B4BF350"
+ "MsmKey" = "8:_DB393853A0CAE22441FB3507BADEDA0C"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_DCF038FB05564F838D3B7BC2FF0DFB00"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C3E6BFA4931C6032883C0F01E8170F3D"
- "OwnerKey" = "8:_DD124BAFB9C5A973015A05C38235051E"
+ "MsmKey" = "8:_DD60E71D0A7F739951397CE736D05181"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C3E6BFA4931C6032883C0F01E8170F3D"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_DFC9E570D3CB9903D16418054C99A77C"
+ "OwnerKey" = "8:_FE0C642F2E354DEBAB2A5611EB8DBADF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C491653DD3D812134973352698CA5CD6"
- "OwnerKey" = "8:_B2F6067BC7CB389369D6EE32DE429E0B"
+ "MsmKey" = "8:_DFC9E570D3CB9903D16418054C99A77C"
+ "OwnerKey" = "8:_DA1FAA642B43AE6E5808C9BB4B524476"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C491653DD3D812134973352698CA5CD6"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_DFC9E570D3CB9903D16418054C99A77C"
+ "OwnerKey" = "8:_912F92AA4EA51238D25AD70707B09879"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C491653DD3D812134973352698CA5CD6"
- "OwnerKey" = "8:_3CFCE5936DE46644A11496579247127C"
+ "MsmKey" = "8:_DFC9E570D3CB9903D16418054C99A77C"
+ "OwnerKey" = "8:_DAB88F3754B3472773A36BF9200C7E84"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C8F0024906707A2A17F6F1FB0DE813C3"
- "OwnerKey" = "8:_BA7099657E8F99C2A08625CAA19478A2"
+ "MsmKey" = "8:_DFC9E570D3CB9903D16418054C99A77C"
+ "OwnerKey" = "8:_1C441FD8EE84252FBCFB7BBCF2A4B1BF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C8F0024906707A2A17F6F1FB0DE813C3"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_DFC9E570D3CB9903D16418054C99A77C"
+ "OwnerKey" = "8:_C98E750DC9BF2A9012E5533F75B173BD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C8F0024906707A2A17F6F1FB0DE813C3"
- "OwnerKey" = "8:_C3E6BFA4931C6032883C0F01E8170F3D"
+ "MsmKey" = "8:_E41AF028B14FCD0ECDE74E3E92CF839E"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C8F0024906707A2A17F6F1FB0DE813C3"
- "OwnerKey" = "8:_B2F6067BC7CB389369D6EE32DE429E0B"
+ "MsmKey" = "8:_F1486ED433F0280033EE2E751D0D305A"
+ "OwnerKey" = "8:_B13E0BB59CEF240C3CF9E58DBE21C485"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C8F0024906707A2A17F6F1FB0DE813C3"
- "OwnerKey" = "8:_3CFCE5936DE46644A11496579247127C"
+ "MsmKey" = "8:_F6DD36A95B2ABD8E0E4EAD30751C9A1D"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C8F0024906707A2A17F6F1FB0DE813C3"
- "OwnerKey" = "8:_C491653DD3D812134973352698CA5CD6"
+ "MsmKey" = "8:_F6F7551319CDB279439D3F1BD41C38DC"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D5E7AF890D491C291D523A7925A7CAFD"
- "OwnerKey" = "8:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "MsmKey" = "8:_FBF5D50B3C35A7D5883A5304F29C2337"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D5E7AF890D491C291D523A7925A7CAFD"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_FC53A4376AD5925F339250F7D6B79EC2"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_DC3E37329F41CEFA8CAFC49272FD79E8"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_FE0C642F2E354DEBAB2A5611EB8DBADF"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_DD124BAFB9C5A973015A05C38235051E"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_FE5E0C2AD492A5D6D2BE8F0C6F779AB3"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F12F116E3E1B4E7E73ABE059D5C3AD3F"
- "OwnerKey" = "8:_8388FBAB54C00B61D25222B7722A14FC"
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_23FFFD358C644D5B84FF5FE82CD5F2A9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F12F116E3E1B4E7E73ABE059D5C3AD3F"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_FE0C642F2E354DEBAB2A5611EB8DBADF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F12F116E3E1B4E7E73ABE059D5C3AD3F"
- "OwnerKey" = "8:_48C2CFF3A224AB99DE828B3CDA8965C7"
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_A0364BE02C0DA86A1BC575C7758152D1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F12F116E3E1B4E7E73ABE059D5C3AD3F"
- "OwnerKey" = "8:_116D4F582206CAC904A7CC28C68406F6"
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_70E8D2F25248403155E063694C68FCC3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F12F116E3E1B4E7E73ABE059D5C3AD3F"
- "OwnerKey" = "8:_021E13A20FE7DD9D704A86A6B2C25A4E"
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_CFC629C1253E8782D7D9F255953993D1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F12F116E3E1B4E7E73ABE059D5C3AD3F"
- "OwnerKey" = "8:_1227ACAE79530932DBE95EAE8A81A6A3"
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_205C1E495DCCCD8ABD26447A128EA2AC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_FA689EDE572A4275B3EB639724BC49EA"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_C55D1B5DD6E93C23FAC3CB232D4B7CC2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_FE5E0C2AD492A5D6D2BE8F0C6F779AB3"
- "OwnerKey" = "8:_B7E6A520AA7A53D613CE1CFC9B4BF350"
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_B27E251D86925B0F110BD31DAFB2CEF3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_89201382210B42118C426696FE51E718"
+ "OwnerKey" = "8:_DB393853A0CAE22441FB3507BADEDA0C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_FA689EDE572A4275B3EB639724BC49EA"
+ "OwnerKey" = "8:_73E571AA7490969BDDA6694F02C608B6"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_A00B5E31F3254BD39E9894075ED56CC5"
+ "OwnerKey" = "8:_3F153E524AF018252A8A650243B22F79"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_7C096072C24B4A2D98D062A3681C55A8"
+ "OwnerKey" = "8:_F1486ED433F0280033EE2E751D0D305A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_46CFD1C439C942A3A5B4DE3A14F78B23"
+ "OwnerKey" = "8:_D2E1EFCC41C2B1D302666F750070B925"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_B012C0E4C87990DA2E82471C97DE5059"
+ "OwnerKey" = "8:_420573D8FAD5EB35642557A6FFFC9726"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_D5E7AF890D491C291D523A7925A7CAFD"
+ "OwnerKey" = "8:_032EBE5268DC18362B89857E8C1B75BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_116D4F582206CAC904A7CC28C68406F6"
+ "OwnerKey" = "8:_6E8E41FFBA48C94F92F93FAADFF8B06C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_5F35FBC60EFDFF28DB83904C13363275"
+ "OwnerKey" = "8:_AD6B71F1069D0C297AF557CF1FEABECD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_48C2CFF3A224AB99DE828B3CDA8965C7"
+ "OwnerKey" = "8:_DD60E71D0A7F739951397CE736D05181"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_0C0DBB1CB162F4FF44EB4F1EF84F806B"
+ "OwnerKey" = "8:_F6DD36A95B2ABD8E0E4EAD30751C9A1D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_021E13A20FE7DD9D704A86A6B2C25A4E"
+ "OwnerKey" = "8:_6672410B499E293D1F8A4694F307D506"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_125B86AFF0026E9BD08A3F56E5B2E550"
+ "OwnerKey" = "8:_FC53A4376AD5925F339250F7D6B79EC2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_8388FBAB54C00B61D25222B7722A14FC"
+ "OwnerKey" = "8:_D57CC0AC6BEF0A9AB4E224E0822DD072"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_1227ACAE79530932DBE95EAE8A81A6A3"
+ "OwnerKey" = "8:_69AB6FEAB79F55BE04BEF8CE1318AE61"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_35EB187B8F1CFB1EFF16C56A6AD6C2C6"
+ "OwnerKey" = "8:_B6CAA1441407196C91BD4E12E84F8504"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_F12F116E3E1B4E7E73ABE059D5C3AD3F"
+ "OwnerKey" = "8:_FE5E0C2AD492A5D6D2BE8F0C6F779AB3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_61528F119D53B38DFB9BB04873B47A49"
+ "OwnerKey" = "8:_4326A741A8462642E1145BF329685FD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_A09EEE10C4D8EDFDF9878D0996951271"
+ "OwnerKey" = "8:_F6F7551319CDB279439D3F1BD41C38DC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_61C126C5476411D56039CE2B09EC03E3"
+ "OwnerKey" = "8:_B8ADA632090ABB2B34E2F7FEB4A7D615"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_14E0C3A8EB137A30AE332CBA2BE9453F"
+ "OwnerKey" = "8:_FBF5D50B3C35A7D5883A5304F29C2337"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_DD124BAFB9C5A973015A05C38235051E"
+ "OwnerKey" = "8:_E41AF028B14FCD0ECDE74E3E92CF839E"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_C3E6BFA4931C6032883C0F01E8170F3D"
+ "OwnerKey" = "8:_0EE6987F697D10D2D01D484B5048F7E8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_B2F6067BC7CB389369D6EE32DE429E0B"
+ "OwnerKey" = "8:_DA1FAA642B43AE6E5808C9BB4B524476"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_3CFCE5936DE46644A11496579247127C"
+ "OwnerKey" = "8:_C98E750DC9BF2A9012E5533F75B173BD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_C491653DD3D812134973352698CA5CD6"
+ "OwnerKey" = "8:_912F92AA4EA51238D25AD70707B09879"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_BA7099657E8F99C2A08625CAA19478A2"
+ "OwnerKey" = "8:_DAB88F3754B3472773A36BF9200C7E84"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_C8F0024906707A2A17F6F1FB0DE813C3"
+ "OwnerKey" = "8:_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_A11580013C2A7A2BDF97F82F62526014"
+ "OwnerKey" = "8:_1C441FD8EE84252FBCFB7BBCF2A4B1BF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_DC3E37329F41CEFA8CAFC49272FD79E8"
+ "OwnerKey" = "8:_DFC9E570D3CB9903D16418054C99A77C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_B7E6A520AA7A53D613CE1CFC9B4BF350"
+ "OwnerKey" = "8:_DCF038FB05564F838D3B7BC2FF0DFB00"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_FE5E0C2AD492A5D6D2BE8F0C6F779AB3"
+ "OwnerKey" = "8:_8C340FF38D0446B9BF2C181E989C9864"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_4326A741A8462642E1145BF329685FD9"
+ "OwnerKey" = "8:_48B63F68326C44D99E930B9E43A8122C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
+ "OwnerKey" = "8:_441A01E69AA74C3C9CF056C53AE7D9E8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_B8ADA632090ABB2B34E2F7FEB4A7D615"
+ "OwnerKey" = "8:_493006B8F0C587C5A5A781A99FFD331F"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_638F6778A97281D9473464A25C75531B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_D8663E8561E29776603567AA70FFDA4A"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_B7E7B9EAF6306AB68365DB69CF16F7A5"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_8894EBEF178AE4CAA2B5B9019BC8C290"
"MsmSig" = "8:_UNDEFINED"
}
}
@@ -851,7 +917,7 @@
"DisplayName" = "8:Release"
"IsDebugOnly" = "11:FALSE"
"IsReleaseOnly" = "11:TRUE"
- "OutputFilename" = "8:Release\\Setup.msi"
+ "OutputFilename" = "8:Release\\ENTcapture.msi"
"PackageFilesAs" = "3:2"
"PackageFileSize" = "3:-2147483648"
"CabType" = "3:1"
@@ -870,10 +936,10 @@
"ComponentsUrl" = "8:"
"Items"
{
- "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2"
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.8"
{
- "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)"
- "ProductCode" = "8:.NETFramework,Version=v4.7.2"
+ "Name" = "8:Microsoft .NET Framework 4.8 (x86 および x64)"
+ "ProductCode" = "8:.NETFramework,Version=v4.8"
}
}
}
@@ -898,7 +964,7 @@
{
"Name" = "8:.NET Framework"
"Message" = "8:[VSDNETMSG]"
- "FrameworkVersion" = "8:.NETFramework,Version=v4.7.2"
+ "FrameworkVersion" = "8:.NETFramework,Version=v4.8"
"AllowLaterVersions" = "11:FALSE"
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=863262"
}
@@ -906,20 +972,20 @@
}
"File"
{
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_021E13A20FE7DD9D704A86A6B2C25A4E"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_032EBE5268DC18362B89857E8C1B75BA"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_021E13A20FE7DD9D704A86A6B2C25A4E"
+ "_032EBE5268DC18362B89857E8C1B75BA"
{
- "Name" = "8:System.Collections.Immutable.dll"
+ "Name" = "8:netstandard.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Collections.Immutable.dll"
+ "SourcePath" = "8:netstandard.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -933,24 +999,24 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0C0DBB1CB162F4FF44EB4F1EF84F806B"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0EE6987F697D10D2D01D484B5048F7E8"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Diagnostics.DiagnosticSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:Accord.Video.DirectShow, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_0C0DBB1CB162F4FF44EB4F1EF84F806B"
+ "_0EE6987F697D10D2D01D484B5048F7E8"
{
- "Name" = "8:System.Diagnostics.DiagnosticSource.dll"
+ "Name" = "8:Accord.Video.DirectShow.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Diagnostics.DiagnosticSource.dll"
+ "SourcePath" = "8:Accord.Video.DirectShow.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -968,12 +1034,12 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F9EC7B0F06B433C8FCE1072DAF7E6F4"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_192F1D3F9CDD4C2CA0D2DF786A8F870C"
{
- "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\dll\\x64\\opencv_videoio_ffmpeg490_64.dll"
- "TargetName" = "8:opencv_videoio_ffmpeg490_64.dll"
+ "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\opencv_videoio_ffmpeg4100_64.dll"
+ "TargetName" = "8:opencv_videoio_ffmpeg4100_64.dll"
"Tag" = "8:"
- "Folder" = "8:_4DCAC6631A234C579E6201CA4C0B2D1F"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -988,20 +1054,20 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_116D4F582206CAC904A7CC28C68406F6"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1C441FD8EE84252FBCFB7BBCF2A4B1BF"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:Accord.Math.Core, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_116D4F582206CAC904A7CC28C68406F6"
+ "_1C441FD8EE84252FBCFB7BBCF2A4B1BF"
{
- "Name" = "8:System.Text.Json.dll"
+ "Name" = "8:Accord.Math.Core.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Text.Json.dll"
+ "SourcePath" = "8:Accord.Math.Core.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1019,20 +1085,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1227ACAE79530932DBE95EAE8A81A6A3"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_205C1E495DCCCD8ABD26447A128EA2AC"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_1227ACAE79530932DBE95EAE8A81A6A3"
+ "_205C1E495DCCCD8ABD26447A128EA2AC"
{
- "Name" = "8:System.Memory.dll"
+ "Name" = "8:System.ValueTuple.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Memory.dll"
+ "SourcePath" = "8:System.ValueTuple.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1050,20 +1116,51 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_125B86AFF0026E9BD08A3F56E5B2E550"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_23FFFD358C644D5B84FF5FE82CD5F2A9"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_125B86AFF0026E9BD08A3F56E5B2E550"
+ "_23FFFD358C644D5B84FF5FE82CD5F2A9"
{
- "Name" = "8:System.Runtime.CompilerServices.Unsafe.dll"
+ "Name" = "8:System.Buffers.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Runtime.CompilerServices.Unsafe.dll"
+ "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\System.Buffers.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3F153E524AF018252A8A650243B22F79"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_3F153E524AF018252A8A650243B22F79"
+ {
+ "Name" = "8:Microsoft.Extensions.DependencyInjection.Abstractions.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:Microsoft.Extensions.DependencyInjection.Abstractions.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1081,14 +1178,34 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_14E0C3A8EB137A30AE332CBA2BE9453F"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_40BF96A9A752402088BB2F171772F59F"
+ {
+ "SourcePath" = "8:..\\openh264\\openh264-1.8.0-win64.dll"
+ "TargetName" = "8:openh264-1.8.0-win64.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_420573D8FAD5EB35642557A6FFFC9726"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_14E0C3A8EB137A30AE332CBA2BE9453F"
+ "_420573D8FAD5EB35642557A6FFFC9726"
{
"Name" = "8:System.Threading.Tasks.Extensions.dll"
"Attributes" = "3:512"
@@ -1112,20 +1229,82 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_35EB187B8F1CFB1EFF16C56A6AD6C2C6"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4326A741A8462642E1145BF329685FD9"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_4326A741A8462642E1145BF329685FD9"
+ {
+ "Name" = "8:System.IO.Compression.FileSystem.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:System.IO.Compression.FileSystem.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_441A01E69AA74C3C9CF056C53AE7D9E8"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+ "AssemblyAsmDisplayName" = "8:OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_35EB187B8F1CFB1EFF16C56A6AD6C2C6"
+ "_441A01E69AA74C3C9CF056C53AE7D9E8"
{
- "Name" = "8:System.Numerics.Vectors.dll"
+ "Name" = "8:OpenCvSharp.Extensions.dll"
+ "Attributes" = "3:576"
+ }
+ }
+ "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\OpenCvSharp.Extensions.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:1"
+ "Transitive" = "11:TRUE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_48B63F68326C44D99E930B9E43A8122C"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:OpenCvSharp.WpfExtensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_48B63F68326C44D99E930B9E43A8122C"
+ {
+ "Name" = "8:OpenCvSharp.WpfExtensions.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Numerics.Vectors.dll"
+ "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\OpenCvSharp.WpfExtensions.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1140,23 +1319,134 @@
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_493006B8F0C587C5A5A781A99FFD331F"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_493006B8F0C587C5A5A781A99FFD331F"
+ {
+ "Name" = "8:OpenCvSharp.dll"
+ "Attributes" = "3:576"
+ }
+ }
+ "SourcePath" = "8:OpenCvSharp.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:1"
+ "Transitive" = "11:TRUE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3CFCE5936DE46644A11496579247127C"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4A21ACD373B647BD8E39FA0C1E2A92D6"
+ {
+ "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\dll\\x64\\opencv_videoio_ffmpeg4100_64.dll"
+ "TargetName" = "8:opencv_videoio_ffmpeg4100_64.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_4DCAC6631A234C579E6201CA4C0B2D1F"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_51F22015B23E4CE197F50F03349E4BD8"
+ {
+ "SourcePath" = "8:..\\icons\\icon.ico"
+ "TargetName" = "8:icon.ico"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5E6B288C33C0435C8DBCC8C81FE3A834"
+ {
+ "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\ENTcapture.exe.config"
+ "TargetName" = "8:ENTcapture.exe.config"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6335BFBF099449C993FA711B48E361C5"
+ {
+ "SourcePath" = "8:..\\ffmpeg-4.3-win64-static\\bin\\ffmpeg.exe"
+ "TargetName" = "8:ffmpeg.exe"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_638F6778A97281D9473464A25C75531B"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Accord.Statistics, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_3CFCE5936DE46644A11496579247127C"
+ "_638F6778A97281D9473464A25C75531B"
{
- "Name" = "8:Accord.Statistics.dll"
+ "Name" = "8:System.Memory.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:Accord.Statistics.dll"
+ "SourcePath" = "8:System.Memory.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1174,20 +1464,175 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4326A741A8462642E1145BF329685FD9"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6672410B499E293D1F8A4694F307D506"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:TRUE"
- "AssemblyAsmDisplayName" = "8:System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_4326A741A8462642E1145BF329685FD9"
+ "_6672410B499E293D1F8A4694F307D506"
{
- "Name" = "8:System.IO.Compression.FileSystem.dll"
+ "Name" = "8:System.Security.Cryptography.Algorithms.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:System.Security.Cryptography.Algorithms.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_69AB6FEAB79F55BE04BEF8CE1318AE61"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_69AB6FEAB79F55BE04BEF8CE1318AE61"
+ {
+ "Name" = "8:System.Runtime.InteropServices.RuntimeInformation.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:System.Runtime.InteropServices.RuntimeInformation.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6E8E41FFBA48C94F92F93FAADFF8B06C"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.Xml.XPath.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_6E8E41FFBA48C94F92F93FAADFF8B06C"
+ {
+ "Name" = "8:System.Xml.XPath.XDocument.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:System.Xml.XPath.XDocument.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_70E8D2F25248403155E063694C68FCC3"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_70E8D2F25248403155E063694C68FCC3"
+ {
+ "Name" = "8:System.Threading.Channels.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:System.Threading.Channels.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_73E571AA7490969BDDA6694F02C608B6"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_73E571AA7490969BDDA6694F02C608B6"
+ {
+ "Name" = "8:Microsoft.Extensions.Logging.Abstractions.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:Microsoft.Extensions.Logging.Abstractions.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8894EBEF178AE4CAA2B5B9019BC8C290"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_8894EBEF178AE4CAA2B5B9019BC8C290"
+ {
+ "Name" = "8:System.Buffers.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.IO.Compression.FileSystem.dll"
+ "SourcePath" = "8:System.Buffers.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1205,20 +1650,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_46CFD1C439C942A3A5B4DE3A14F78B23"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8C340FF38D0446B9BF2C181E989C9864"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:System.Drawing.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_46CFD1C439C942A3A5B4DE3A14F78B23"
+ "_8C340FF38D0446B9BF2C181E989C9864"
{
- "Name" = "8:System.ValueTuple.dll"
+ "Name" = "8:System.Drawing.Common.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\System.ValueTuple.dll"
+ "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\System.Drawing.Common.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1236,20 +1681,20 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_48C2CFF3A224AB99DE828B3CDA8965C7"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_912F92AA4EA51238D25AD70707B09879"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:Accord.Statistics, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_48C2CFF3A224AB99DE828B3CDA8965C7"
+ "_912F92AA4EA51238D25AD70707B09879"
{
- "Name" = "8:System.Text.Encodings.Web.dll"
+ "Name" = "8:Accord.Statistics.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Text.Encodings.Web.dll"
+ "SourcePath" = "8:Accord.Statistics.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1267,14 +1712,25 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_51F22015B23E4CE197F50F03349E4BD8"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A0364BE02C0DA86A1BC575C7758152D1"
{
- "SourcePath" = "8:..\\icons\\icon.ico"
- "TargetName" = "8:icon.ico"
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_A0364BE02C0DA86A1BC575C7758152D1"
+ {
+ "Name" = "8:OpenCvSharp.Extensions.dll"
+ "Attributes" = "3:576"
+ }
+ }
+ "SourcePath" = "8:OpenCvSharp.Extensions.dll"
+ "TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
+ "Condition" = "8:1"
+ "Transitive" = "11:TRUE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
@@ -1284,17 +1740,17 @@
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5F35FBC60EFDFF28DB83904C13363275"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AD6B71F1069D0C297AF557CF1FEABECD"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.ValueTuple, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_5F35FBC60EFDFF28DB83904C13363275"
+ "_AD6B71F1069D0C297AF557CF1FEABECD"
{
"Name" = "8:System.ValueTuple.dll"
"Attributes" = "3:512"
@@ -1318,23 +1774,12 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_61528F119D53B38DFB9BB04873B47A49"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ADFE838C5CD44E878860FDD6DE00B079"
{
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"
- "ScatterAssemblies"
- {
- "_61528F119D53B38DFB9BB04873B47A49"
- {
- "Name" = "8:Microsoft.Extensions.DependencyInjection.Abstractions.dll"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:Microsoft.Extensions.DependencyInjection.Abstractions.dll"
- "TargetName" = "8:"
+ "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\dll\\x64\\OpenCvSharpExtern.dll"
+ "TargetName" = "8:OpenCvSharpExtern.dll"
"Tag" = "8:"
- "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Folder" = "8:_4DCAC6631A234C579E6201CA4C0B2D1F"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1346,23 +1791,23 @@
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
- "IsDependency" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_61C126C5476411D56039CE2B09EC03E3"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B13E0BB59CEF240C3CF9E58DBE21C485"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:Npgsql, Version=8.0.5.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_61C126C5476411D56039CE2B09EC03E3"
+ "_B13E0BB59CEF240C3CF9E58DBE21C485"
{
- "Name" = "8:Microsoft.Bcl.AsyncInterfaces.dll"
+ "Name" = "8:Npgsql.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:Microsoft.Bcl.AsyncInterfaces.dll"
+ "SourcePath" = "8:Npgsql.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1380,10 +1825,21 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6335BFBF099449C993FA711B48E361C5"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B27E251D86925B0F110BD31DAFB2CEF3"
{
- "SourcePath" = "8:..\\ffmpeg-4.3-win64-static\\bin\\ffmpeg.exe"
- "TargetName" = "8:ffmpeg.exe"
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:System.Diagnostics.DiagnosticSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_B27E251D86925B0F110BD31DAFB2CEF3"
+ {
+ "Name" = "8:System.Diagnostics.DiagnosticSource.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:System.Diagnostics.DiagnosticSource.dll"
+ "TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
"Condition" = "8:"
@@ -1397,23 +1853,23 @@
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7A7C03EB5C7CBE693182A5E1345CFF6F"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B6CAA1441407196C91BD4E12E84F8504"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.Net.Sockets, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_7A7C03EB5C7CBE693182A5E1345CFF6F"
+ "_B6CAA1441407196C91BD4E12E84F8504"
{
- "Name" = "8:OpenCvSharp.Extensions.dll"
+ "Name" = "8:System.Net.Sockets.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:OpenCvSharp.Extensions.dll"
+ "SourcePath" = "8:System.Net.Sockets.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1427,24 +1883,24 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7C096072C24B4A2D98D062A3681C55A8"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B7E7B9EAF6306AB68365DB69CF16F7A5"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_7C096072C24B4A2D98D062A3681C55A8"
+ "_B7E7B9EAF6306AB68365DB69CF16F7A5"
{
- "Name" = "8:Microsoft.Bcl.HashCode.dll"
+ "Name" = "8:System.Numerics.Vectors.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\Microsoft.Bcl.HashCode.dll"
+ "SourcePath" = "8:System.Numerics.Vectors.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1459,23 +1915,23 @@
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8388FBAB54C00B61D25222B7722A14FC"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B8ADA632090ABB2B34E2F7FEB4A7D615"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.Diagnostics.Tracing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_8388FBAB54C00B61D25222B7722A14FC"
+ "_B8ADA632090ABB2B34E2F7FEB4A7D615"
{
- "Name" = "8:Microsoft.Extensions.Logging.Abstractions.dll"
+ "Name" = "8:System.Diagnostics.Tracing.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:Microsoft.Extensions.Logging.Abstractions.dll"
+ "SourcePath" = "8:System.Diagnostics.Tracing.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1489,24 +1945,24 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8C0208A7B8BAE7847A63E18F16DC1867"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Npgsql, Version=8.0.3.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_8C0208A7B8BAE7847A63E18F16DC1867"
+ "_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
{
- "Name" = "8:Npgsql.dll"
+ "Name" = "8:System.IO.Compression.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:Npgsql.dll"
+ "SourcePath" = "8:System.IO.Compression.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1520,24 +1976,24 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A00B5E31F3254BD39E9894075ED56CC5"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C55D1B5DD6E93C23FAC3CB232D4B7CC2"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_A00B5E31F3254BD39E9894075ED56CC5"
+ "_C55D1B5DD6E93C23FAC3CB232D4B7CC2"
{
- "Name" = "8:System.Numerics.Vectors.dll"
+ "Name" = "8:System.Text.Encodings.Web.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\System.Numerics.Vectors.dll"
+ "SourcePath" = "8:System.Text.Encodings.Web.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1552,23 +2008,23 @@
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A09EEE10C4D8EDFDF9878D0996951271"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C98E750DC9BF2A9012E5533F75B173BD"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"
+ "AssemblyAsmDisplayName" = "8:Accord.Imaging, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_A09EEE10C4D8EDFDF9878D0996951271"
+ "_C98E750DC9BF2A9012E5533F75B173BD"
{
- "Name" = "8:Microsoft.Bcl.HashCode.dll"
+ "Name" = "8:Accord.Imaging.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:Microsoft.Bcl.HashCode.dll"
+ "SourcePath" = "8:Accord.Imaging.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1586,20 +2042,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A11580013C2A7A2BDF97F82F62526014"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CFC629C1253E8782D7D9F255953993D1"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+ "AssemblyAsmDisplayName" = "8:System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_A11580013C2A7A2BDF97F82F62526014"
+ "_CFC629C1253E8782D7D9F255953993D1"
{
- "Name" = "8:System.Net.Http.dll"
+ "Name" = "8:System.Text.Json.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Net.Http.dll"
+ "SourcePath" = "8:System.Text.Json.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1617,20 +2073,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AA88AA60956A2B7AAA3198CCC46A8B71"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D2E1EFCC41C2B1D302666F750070B925"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_AA88AA60956A2B7AAA3198CCC46A8B71"
+ "_D2E1EFCC41C2B1D302666F750070B925"
{
- "Name" = "8:OpenCvSharp.dll"
+ "Name" = "8:Microsoft.Bcl.AsyncInterfaces.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:OpenCvSharp.dll"
+ "SourcePath" = "8:Microsoft.Bcl.AsyncInterfaces.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1648,12 +2104,12 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ADFE838C5CD44E878860FDD6DE00B079"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D4529EEBD156454CAB6D653B05DF0671"
{
- "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\dll\\x64\\OpenCvSharpExtern.dll"
+ "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\OpenCvSharpExtern.dll"
"TargetName" = "8:OpenCvSharpExtern.dll"
"Tag" = "8:"
- "Folder" = "8:_4DCAC6631A234C579E6201CA4C0B2D1F"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1668,20 +2124,20 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B012C0E4C87990DA2E82471C97DE5059"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D57CC0AC6BEF0A9AB4E224E0822DD072"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Drawing.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_B012C0E4C87990DA2E82471C97DE5059"
+ "_D57CC0AC6BEF0A9AB4E224E0822DD072"
{
- "Name" = "8:System.Drawing.Common.dll"
+ "Name" = "8:System.Runtime.Serialization.Primitives.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Drawing.Common.dll"
+ "SourcePath" = "8:System.Runtime.Serialization.Primitives.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1699,20 +2155,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B2F6067BC7CB389369D6EE32DE429E0B"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D8663E8561E29776603567AA70FFDA4A"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Accord.Imaging, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_B2F6067BC7CB389369D6EE32DE429E0B"
+ "_D8663E8561E29776603567AA70FFDA4A"
{
- "Name" = "8:Accord.Imaging.dll"
+ "Name" = "8:System.Runtime.CompilerServices.Unsafe.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:Accord.Imaging.dll"
+ "SourcePath" = "8:System.Runtime.CompilerServices.Unsafe.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1730,20 +2186,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B7E6A520AA7A53D613CE1CFC9B4BF350"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DA1FAA642B43AE6E5808C9BB4B524476"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"
+ "AssemblyAsmDisplayName" = "8:Accord.Video, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_B7E6A520AA7A53D613CE1CFC9B4BF350"
+ "_DA1FAA642B43AE6E5808C9BB4B524476"
{
- "Name" = "8:netstandard.dll"
+ "Name" = "8:Accord.Video.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:netstandard.dll"
+ "SourcePath" = "8:Accord.Video.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1761,20 +2217,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B8ADA632090ABB2B34E2F7FEB4A7D615"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DAB88F3754B3472773A36BF9200C7E84"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:TRUE"
- "AssemblyAsmDisplayName" = "8:System.Diagnostics.Tracing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:Accord.Math, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_B8ADA632090ABB2B34E2F7FEB4A7D615"
+ "_DAB88F3754B3472773A36BF9200C7E84"
{
- "Name" = "8:System.Diagnostics.Tracing.dll"
+ "Name" = "8:Accord.Math.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Diagnostics.Tracing.dll"
+ "SourcePath" = "8:Accord.Math.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1792,20 +2248,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BA7099657E8F99C2A08625CAA19478A2"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DB393853A0CAE22441FB3507BADEDA0C"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Accord.Math.Core, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_BA7099657E8F99C2A08625CAA19478A2"
+ "_DB393853A0CAE22441FB3507BADEDA0C"
{
- "Name" = "8:Accord.Math.Core.dll"
+ "Name" = "8:System.Collections.Immutable.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:Accord.Math.Core.dll"
+ "SourcePath" = "8:System.Collections.Immutable.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1823,20 +2279,51 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DCF038FB05564F838D3B7BC2FF0DFB00"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_DCF038FB05564F838D3B7BC2FF0DFB00"
+ {
+ "Name" = "8:OpenCvSharp.dll"
+ "Attributes" = "3:576"
+ }
+ }
+ "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\OpenCvSharp.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
+ "Condition" = "8:1"
+ "Transitive" = "11:TRUE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DD60E71D0A7F739951397CE736D05181"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:TRUE"
- "AssemblyAsmDisplayName" = "8:System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:System.Threading.Overlapped, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_BE39F9F92DC6E04BE3C5C04DFCCE5DE8"
+ "_DD60E71D0A7F739951397CE736D05181"
{
- "Name" = "8:System.IO.Compression.dll"
+ "Name" = "8:System.Threading.Overlapped.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.IO.Compression.dll"
+ "SourcePath" = "8:System.Threading.Overlapped.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1854,20 +2341,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C3E6BFA4931C6032883C0F01E8170F3D"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DFC9E570D3CB9903D16418054C99A77C"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Accord.Video, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:Accord, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_C3E6BFA4931C6032883C0F01E8170F3D"
+ "_DFC9E570D3CB9903D16418054C99A77C"
{
- "Name" = "8:Accord.Video.dll"
+ "Name" = "8:Accord.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:Accord.Video.dll"
+ "SourcePath" = "8:Accord.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1885,20 +2372,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C491653DD3D812134973352698CA5CD6"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E41AF028B14FCD0ECDE74E3E92CF839E"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Accord.Math, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.Data.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_C491653DD3D812134973352698CA5CD6"
+ "_E41AF028B14FCD0ECDE74E3E92CF839E"
{
- "Name" = "8:Accord.Math.dll"
+ "Name" = "8:System.Data.Common.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:Accord.Math.dll"
+ "SourcePath" = "8:System.Data.Common.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1912,24 +2399,24 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C8F0024906707A2A17F6F1FB0DE813C3"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F1486ED433F0280033EE2E751D0D305A"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Accord, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_C8F0024906707A2A17F6F1FB0DE813C3"
+ "_F1486ED433F0280033EE2E751D0D305A"
{
- "Name" = "8:Accord.dll"
+ "Name" = "8:Microsoft.Bcl.HashCode.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:Accord.dll"
+ "SourcePath" = "8:Microsoft.Bcl.HashCode.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1947,20 +2434,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D5E7AF890D491C291D523A7925A7CAFD"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F6DD36A95B2ABD8E0E4EAD30751C9A1D"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.Security.SecureString, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_D5E7AF890D491C291D523A7925A7CAFD"
+ "_F6DD36A95B2ABD8E0E4EAD30751C9A1D"
{
- "Name" = "8:System.Threading.Channels.dll"
+ "Name" = "8:System.Security.SecureString.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Threading.Channels.dll"
+ "SourcePath" = "8:System.Security.SecureString.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -1978,20 +2465,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DC3E37329F41CEFA8CAFC49272FD79E8"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F6F7551319CDB279439D3F1BD41C38DC"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.IO.Compression, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.Globalization.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_DC3E37329F41CEFA8CAFC49272FD79E8"
+ "_F6F7551319CDB279439D3F1BD41C38DC"
{
- "Name" = "8:System.IO.Compression.dll"
+ "Name" = "8:System.Globalization.Extensions.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.IO.Compression.dll"
+ "SourcePath" = "8:System.Globalization.Extensions.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -2005,24 +2492,24 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DD124BAFB9C5A973015A05C38235051E"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FBF5D50B3C35A7D5883A5304F29C2337"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Accord.Video.DirectShow, Version=3.8.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.Diagnostics.StackTrace, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_DD124BAFB9C5A973015A05C38235051E"
+ "_FBF5D50B3C35A7D5883A5304F29C2337"
{
- "Name" = "8:Accord.Video.DirectShow.dll"
+ "Name" = "8:System.Diagnostics.StackTrace.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:Accord.Video.DirectShow.dll"
+ "SourcePath" = "8:System.Diagnostics.StackTrace.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -2036,24 +2523,24 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F12F116E3E1B4E7E73ABE059D5C3AD3F"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FC53A4376AD5925F339250F7D6B79EC2"
{
"AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"
+ "AssemblyIsInGAC" = "11:TRUE"
+ "AssemblyAsmDisplayName" = "8:System.Runtime.Serialization.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_F12F116E3E1B4E7E73ABE059D5C3AD3F"
+ "_FC53A4376AD5925F339250F7D6B79EC2"
{
- "Name" = "8:System.Buffers.dll"
+ "Name" = "8:System.Runtime.Serialization.Xml.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:System.Buffers.dll"
+ "SourcePath" = "8:System.Runtime.Serialization.Xml.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -2071,20 +2558,20 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FA689EDE572A4275B3EB639724BC49EA"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FE0C642F2E354DEBAB2A5611EB8DBADF"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:ENTcapture, Version=1.24.11.7, Culture=neutral, processorArchitecture=AMD64"
"ScatterAssemblies"
{
- "_FA689EDE572A4275B3EB639724BC49EA"
+ "_FE0C642F2E354DEBAB2A5611EB8DBADF"
{
- "Name" = "8:System.Buffers.dll"
+ "Name" = "8:ENTcapture.exe"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\System.Buffers.dll"
+ "SourcePath" = "8:..\\OpenCV_CS\\bin\\x64\\Release\\ENTcapture.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
@@ -2129,7 +2616,7 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
@@ -2211,15 +2698,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:ENTcapture"
- "ProductCode" = "8:{1B1E89C0-E9FB-414E-A198-89F271536251}"
- "PackageCode" = "8:{3EE2A907-6573-4984-90EE-D9D00DC516DA}"
+ "ProductCode" = "8:{8ABE936E-9676-42E1-ACD8-521B60B712FA}"
+ "PackageCode" = "8:{BCA44E70-18B4-46BD-A781-E9344D16394B}"
"UpgradeCode" = "8:{6662B1F6-82D4-495B-8AA6-6FFC065F1929}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:1.24.613"
+ "ProductVersion" = "8:1.24.1108"
"Manufacturer" = "8:YUKI ENT clinic"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
@@ -2340,7 +2827,7 @@
"ShowCmd" = "3:1"
"IconIndex" = "3:0"
"Transitive" = "11:FALSE"
- "Target" = "8:_89201382210B42118C426696FE51E718"
+ "Target" = "8:_FE0C642F2E354DEBAB2A5611EB8DBADF"
"Folder" = "8:_A0350D026AD640CD937315ACC7943E43"
"WorkingFolder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
"Icon" = "8:_51F22015B23E4CE197F50F03349E4BD8"
@@ -2354,7 +2841,7 @@
"ShowCmd" = "3:1"
"IconIndex" = "3:0"
"Transitive" = "11:FALSE"
- "Target" = "8:_89201382210B42118C426696FE51E718"
+ "Target" = "8:_FE0C642F2E354DEBAB2A5611EB8DBADF"
"Folder" = "8:_D65D8D8900464111B2CCA2297F3171D9"
"WorkingFolder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
"Icon" = "8:_51F22015B23E4CE197F50F03349E4BD8"
@@ -2759,34 +3246,6 @@
}
"ProjectOutput"
{
- "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_89201382210B42118C426696FE51E718"
- {
- "SourcePath" = "8:..\\OpenCV_CS\\obj\\x64\\Release\\ENTcapture.exe"
- "TargetName" = "8:"
- "Tag" = "8:"
- "Folder" = "8:_010A832CA822415D9443D7C82EB2F5B1"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- "ProjectOutputGroupRegister" = "3:1"
- "OutputConfiguration" = "8:Release|x64"
- "OutputGroupCanonicalName" = "8:Built"
- "OutputProjectGuid" = "8:{80367970-848C-42CE-86DC-6C07E594C0AF}"
- "ShowKeyOutput" = "11:TRUE"
- "ExcludeFilters"
- {
- }
- }
}
}
}
diff --git a/openh264/openh264-1.8.0-win64.dll b/openh264/openh264-1.8.0-win64.dll
new file mode 100644
index 0000000..99fb7b2
Binary files /dev/null and b/openh264/openh264-1.8.0-win64.dll differ
diff --git a/openh264/openh264-2.4.1-win64.dll b/openh264/openh264-2.4.1-win64.dll
new file mode 100644
index 0000000..7541285
Binary files /dev/null and b/openh264/openh264-2.4.1-win64.dll differ