aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Common/Utilities
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.Common/Utilities')
-rw-r--r--Ryujinx.Common/Utilities/EmbeddedResources.cs16
-rw-r--r--Ryujinx.Common/Utilities/StreamUtils.cs18
2 files changed, 20 insertions, 14 deletions
diff --git a/Ryujinx.Common/Utilities/EmbeddedResources.cs b/Ryujinx.Common/Utilities/EmbeddedResources.cs
index e7c8d7d7..22b55f16 100644
--- a/Ryujinx.Common/Utilities/EmbeddedResources.cs
+++ b/Ryujinx.Common/Utilities/EmbeddedResources.cs
@@ -1,3 +1,5 @@
+using Ryujinx.Common.Memory;
+using Ryujinx.Common.Utilities;
using System;
using System.IO;
using System.Linq;
@@ -38,12 +40,7 @@ namespace Ryujinx.Common
return null;
}
- using (var mem = new MemoryStream())
- {
- stream.CopyTo(mem);
-
- return mem.ToArray();
- }
+ return StreamUtils.StreamToBytes(stream);
}
}
@@ -56,12 +53,7 @@ namespace Ryujinx.Common
return null;
}
- using (var mem = new MemoryStream())
- {
- await stream.CopyToAsync(mem);
-
- return mem.ToArray();
- }
+ return await StreamUtils.StreamToBytesAsync(stream);
}
}
diff --git a/Ryujinx.Common/Utilities/StreamUtils.cs b/Ryujinx.Common/Utilities/StreamUtils.cs
index 9bd03ec9..da97188d 100644
--- a/Ryujinx.Common/Utilities/StreamUtils.cs
+++ b/Ryujinx.Common/Utilities/StreamUtils.cs
@@ -1,4 +1,8 @@
-using System.IO;
+using Microsoft.IO;
+using Ryujinx.Common.Memory;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
namespace Ryujinx.Common.Utilities
{
@@ -6,12 +10,22 @@ namespace Ryujinx.Common.Utilities
{
public static byte[] StreamToBytes(Stream input)
{
- using (MemoryStream stream = new MemoryStream())
+ using (MemoryStream stream = MemoryStreamManager.Shared.GetStream())
{
input.CopyTo(stream);
return stream.ToArray();
}
}
+
+ public static async Task<byte[]> StreamToBytesAsync(Stream input, CancellationToken cancellationToken = default)
+ {
+ using (MemoryStream stream = MemoryStreamManager.Shared.GetStream())
+ {
+ await input.CopyToAsync(stream, cancellationToken);
+
+ return stream.ToArray();
+ }
+ }
}
} \ No newline at end of file