Skip to content

Commit 16b6a3c

Browse files
author
Kajetan Jonak
committed
Fixed camera stream null image error
1 parent 7f7c8ab commit 16b6a3c

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

GUI_v2.Model/CameraStreamClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private void ReceiveFrame()
144144
return;
145145
var l = stream.Read(buffer, 0, 4);
146146
int lenght = BitConverter.ToInt32(buffer, 0);
147-
_frame = new byte[lenght + chunkSize - lenght % chunkSize];
147+
_frame = new byte[lenght + chunkSize];// - lenght % chunkSize];
148148
int receivedBytes = 0;
149149
int chunk;
150150
while (receivedBytes < lenght)

GUI_v2.Model/JetsonClient/Receiver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void Receive()
5858
if (rx_state == HEADER)
5959
{
6060
ReadAllFromStream(stream, header_buffer, 4);
61-
msg_length = BitConverter.ToInt32(header_buffer, 0);
61+
msg_length = BitConverter.ToInt32(header_buffer, 0);
6262
rx_state = DATA;
6363
}else if (rx_state == DATA)
6464
{

GUI_v2.ViewModel/Common/CameraStreamViewModel.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ public void SwapImage(Byte[] frame)
2424
// CurrentImage = ImageHelpers.BytesToBitmapImage(frame);
2525
Application.Current.Dispatcher.Invoke(new Action(() =>
2626
{
27-
28-
CurrentImage = ImageHelpers.BytesToBitmapImage(frame);
27+
var temp = ImageHelpers.BytesToBitmapImage(frame);
28+
if (temp != null)
29+
CurrentImage = temp;
2930

3031

3132
}), DispatcherPriority.Render);

GUI_v2.ViewModel/Tools/ImageHelpers.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,18 @@ public static BitmapImage BytesToBitmapImage(Byte[] data)
3030
{
3131
Stream ms = new MemoryStream(data);
3232
BitmapImage img = new BitmapImage();
33-
img.BeginInit();
34-
img.StreamSource = ms;
35-
img.EndInit();
36-
return img;
33+
try
34+
{
35+
img.BeginInit();
36+
img.StreamSource = ms;
37+
img.EndInit();
38+
return img;
39+
}
40+
catch
41+
{
42+
return null;
43+
}
44+
3745
}
3846

3947

0 commit comments

Comments
 (0)