askill
/
Interaction-without-Interaction
mirror of https://github.com/Askill/Interaction-without-Interaction.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Patrice 2019-06-27 19:56:05 +02:00
parent 0cff9a509b 4354ba3e06
commit 73ba945219
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FrontEnd/Communicator.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
@ -92,6 +92,11 @@ namespace FrontEnd
return img; return img;
} }
public static string GetProcessedCameraAddress(Cam cam)
{
return $"{client.BaseAddress.AbsoluteUri}cam/{cam.Id}/processed";
}
public static BitmapImage BytesToImage(byte[] array) public static BitmapImage BytesToImage(byte[] array)
{ {
using (var ms = new System.IO.MemoryStream(array)) using (var ms = new System.IO.MemoryStream(array))

31
FrontEnd/StreamWindow.xaml.cs
View File

@ -35,22 +35,23 @@ namespace FrontEnd
private void Window_Loaded(object sender, RoutedEventArgs e) private void Window_Loaded(object sender, RoutedEventArgs e)
{ {
if (_processed) string steamAddr = _processed ? Communicator.GetProcessedCameraAddress(_cam) : _cam.Ip;
{
_ = Task.Run(async () =>
{
var img = await Communicator.GetProcessedCameraImage(_cam);
_ = imgStream.Dispatcher.Invoke(() => { imgStream.Source = img; });
});
}
else
{
_ = SimpleMJPEGDecoder.StartAsync((BitmapImage img) =>
{
imgStream.Dispatcher.Invoke(() => { imgStream.Source = img; });
}, _cam.Ip); //if (_processed)
} //{
// _ = Task.Run(async () =>
// {
// var img = await Communicator.GetProcessedCameraImage(_cam);
// imgStream.Dispatcher.Invoke(() => { imgStream.Source = img; });
// });
//}
//else
_ = SimpleMJPEGDecoder.StartAsync((BitmapImage img) =>
{
imgStream.Dispatcher.Invoke(() => { imgStream.Source = img; });
}, steamAddr);
} }
} }
} }