assets stream data directly into unmanaged memory
parent
3bd435746b
commit
1cf04a7279
|
@ -53,11 +53,8 @@ namespace MoonWorks.Audio
|
|||
}
|
||||
|
||||
// mostly borrowed from https://github.com/FNA-XNA/FNA/blob/b71b4a35ae59970ff0070dea6f8620856d8d4fec/src/Audio/SoundEffect.cs#L385
|
||||
public static StaticSound LoadWav(AudioDevice device, string filePath)
|
||||
public static unsafe StaticSound LoadWav(AudioDevice device, string filePath)
|
||||
{
|
||||
// Sample data
|
||||
byte[] data;
|
||||
|
||||
// WaveFormatEx data
|
||||
ushort wFormatTag;
|
||||
ushort nChannels;
|
||||
|
@ -68,8 +65,9 @@ namespace MoonWorks.Audio
|
|||
int samplerLoopStart = 0;
|
||||
int samplerLoopEnd = 0;
|
||||
|
||||
using (BinaryReader reader = new BinaryReader(File.OpenRead(filePath)))
|
||||
{
|
||||
using var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read);
|
||||
using var reader = new BinaryReader(stream);
|
||||
|
||||
// RIFF Signature
|
||||
string signature = new string(reader.ReadChars(4));
|
||||
if (signature != "RIFF")
|
||||
|
@ -121,7 +119,9 @@ namespace MoonWorks.Audio
|
|||
}
|
||||
|
||||
int waveDataLength = reader.ReadInt32();
|
||||
data = reader.ReadBytes(waveDataLength);
|
||||
var waveDataBuffer = NativeMemory.Alloc((nuint) waveDataLength);
|
||||
var waveDataSpan = new Span<byte>(waveDataBuffer, waveDataLength);
|
||||
stream.ReadExactly(waveDataSpan);
|
||||
|
||||
// Scan for other chunks
|
||||
while (reader.PeekChar() != -1)
|
||||
|
@ -177,32 +177,32 @@ namespace MoonWorks.Audio
|
|||
}
|
||||
}
|
||||
// End scan
|
||||
}
|
||||
|
||||
return new StaticSound(
|
||||
var sound = new StaticSound(
|
||||
device,
|
||||
wFormatTag,
|
||||
wBitsPerSample,
|
||||
nBlockAlign,
|
||||
nChannels,
|
||||
nSamplesPerSec,
|
||||
data,
|
||||
0,
|
||||
(uint) data.Length
|
||||
(nint) waveDataBuffer,
|
||||
(uint) waveDataLength,
|
||||
true
|
||||
);
|
||||
|
||||
return sound;
|
||||
}
|
||||
|
||||
public unsafe StaticSound(
|
||||
public StaticSound(
|
||||
AudioDevice device,
|
||||
ushort formatTag,
|
||||
ushort bitsPerSample,
|
||||
ushort blockAlign,
|
||||
ushort channels,
|
||||
uint samplesPerSecond,
|
||||
byte[] buffer,
|
||||
uint bufferOffset, /* number of bytes */
|
||||
uint bufferLength /* number of bytes */
|
||||
) : base(device)
|
||||
IntPtr bufferPtr,
|
||||
uint bufferLengthInBytes,
|
||||
bool ownsBuffer) : base(device)
|
||||
{
|
||||
FormatTag = formatTag;
|
||||
BitsPerSample = bitsPerSample;
|
||||
|
@ -210,19 +210,17 @@ namespace MoonWorks.Audio
|
|||
Channels = channels;
|
||||
SamplesPerSecond = samplesPerSecond;
|
||||
|
||||
Handle = new FAudio.FAudioBuffer();
|
||||
Handle.Flags = FAudio.FAUDIO_END_OF_STREAM;
|
||||
Handle.pContext = IntPtr.Zero;
|
||||
Handle.AudioBytes = bufferLength;
|
||||
Handle.pAudioData = (nint) NativeMemory.Alloc(bufferLength);
|
||||
Marshal.Copy(buffer, (int) bufferOffset, Handle.pAudioData, (int) bufferLength);
|
||||
Handle.PlayBegin = 0;
|
||||
Handle.PlayLength = 0;
|
||||
Handle = new FAudio.FAudioBuffer
|
||||
{
|
||||
Flags = FAudio.FAUDIO_END_OF_STREAM,
|
||||
pContext = IntPtr.Zero,
|
||||
pAudioData = bufferPtr,
|
||||
AudioBytes = bufferLengthInBytes,
|
||||
PlayBegin = 0,
|
||||
PlayLength = 0
|
||||
};
|
||||
|
||||
LoopStart = 0;
|
||||
LoopLength = 0;
|
||||
|
||||
OwnsBuffer = true;
|
||||
OwnsBuffer = ownsBuffer;
|
||||
}
|
||||
|
||||
public unsafe StaticSound(
|
||||
|
@ -256,35 +254,6 @@ namespace MoonWorks.Audio
|
|||
OwnsBuffer = true;
|
||||
}
|
||||
|
||||
public StaticSound(
|
||||
AudioDevice device,
|
||||
ushort formatTag,
|
||||
ushort bitsPerSample,
|
||||
ushort blockAlign,
|
||||
ushort channels,
|
||||
uint samplesPerSecond,
|
||||
IntPtr bufferPtr,
|
||||
uint bufferLengthInBytes) : base(device)
|
||||
{
|
||||
FormatTag = formatTag;
|
||||
BitsPerSample = bitsPerSample;
|
||||
BlockAlign = blockAlign;
|
||||
Channels = channels;
|
||||
SamplesPerSecond = samplesPerSecond;
|
||||
|
||||
Handle = new FAudio.FAudioBuffer
|
||||
{
|
||||
Flags = FAudio.FAUDIO_END_OF_STREAM,
|
||||
pContext = IntPtr.Zero,
|
||||
pAudioData = bufferPtr,
|
||||
AudioBytes = bufferLengthInBytes,
|
||||
PlayBegin = 0,
|
||||
PlayLength = 0
|
||||
};
|
||||
|
||||
OwnsBuffer = false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets a sound instance from the pool.
|
||||
/// NOTE: If you lose track of instances, you will create garbage collection pressure!
|
||||
|
|
|
@ -15,10 +15,13 @@ namespace MoonWorks.Audio
|
|||
|
||||
public unsafe static StreamingSoundOgg Load(AudioDevice device, string filePath)
|
||||
{
|
||||
var fileData = File.ReadAllBytes(filePath);
|
||||
var fileDataPtr = NativeMemory.Alloc((nuint) fileData.Length);
|
||||
Marshal.Copy(fileData, 0, (IntPtr) fileDataPtr, fileData.Length);
|
||||
var vorbisHandle = FAudio.stb_vorbis_open_memory((IntPtr) fileDataPtr, fileData.Length, out int error, IntPtr.Zero);
|
||||
var fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read);
|
||||
var fileDataPtr = NativeMemory.Alloc((nuint) fileStream.Length);
|
||||
var fileDataSpan = new Span<byte>(fileDataPtr, (int) fileStream.Length);
|
||||
fileStream.ReadExactly(fileDataSpan);
|
||||
fileStream.Close();
|
||||
|
||||
var vorbisHandle = FAudio.stb_vorbis_open_memory((IntPtr) fileDataPtr, fileDataSpan.Length, out int error, IntPtr.Zero);
|
||||
if (error != 0)
|
||||
{
|
||||
NativeMemory.Free(fileDataPtr);
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using System.Runtime.InteropServices;
|
||||
using WellspringCS;
|
||||
|
||||
namespace MoonWorks.Graphics.Font
|
||||
|
@ -12,11 +13,15 @@ namespace MoonWorks.Graphics.Font
|
|||
|
||||
public unsafe Font(string path)
|
||||
{
|
||||
var bytes = File.ReadAllBytes(path);
|
||||
fixed (byte* pByte = &bytes[0])
|
||||
{
|
||||
Handle = Wellspring.Wellspring_CreateFont((IntPtr) pByte, (uint) bytes.Length);
|
||||
}
|
||||
var fileStream = new FileStream(path, FileMode.Open, FileAccess.Read);
|
||||
var fileByteBuffer = NativeMemory.Alloc((nuint) fileStream.Length);
|
||||
var fileByteSpan = new Span<byte>(fileByteBuffer, (int) fileStream.Length);
|
||||
fileStream.ReadExactly(fileByteSpan);
|
||||
fileStream.Close();
|
||||
|
||||
Handle = Wellspring.Wellspring_CreateFont((IntPtr) fileByteBuffer, (uint) fileByteSpan.Length);
|
||||
|
||||
NativeMemory.Free(fileByteBuffer);
|
||||
}
|
||||
|
||||
protected virtual void Dispose(bool disposing)
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
using RefreshCS;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace MoonWorks.Graphics
|
||||
{
|
||||
|
@ -13,30 +14,29 @@ namespace MoonWorks.Graphics
|
|||
|
||||
public unsafe ShaderModule(GraphicsDevice device, string filePath) : base(device)
|
||||
{
|
||||
using (FileStream stream = new FileStream(filePath, FileMode.Open, FileAccess.Read))
|
||||
{
|
||||
using var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read);
|
||||
Handle = CreateFromStream(device, stream);
|
||||
}
|
||||
}
|
||||
|
||||
public unsafe ShaderModule(GraphicsDevice device, Stream stream) : base(device)
|
||||
{
|
||||
Handle = CreateFromStream(device, stream);
|
||||
}
|
||||
|
||||
private unsafe static IntPtr CreateFromStream(GraphicsDevice device, Stream stream)
|
||||
private static unsafe IntPtr CreateFromStream(GraphicsDevice device, Stream stream)
|
||||
{
|
||||
var bytecode = new byte[stream.Length];
|
||||
stream.Read(bytecode, 0, (int) stream.Length);
|
||||
var bytecodeBuffer = NativeMemory.Alloc((nuint) stream.Length);
|
||||
var bytecodeSpan = new Span<byte>(bytecodeBuffer, (int) stream.Length);
|
||||
stream.ReadExactly(bytecodeSpan);
|
||||
|
||||
fixed (byte* ptr = bytecode)
|
||||
{
|
||||
Refresh.ShaderModuleCreateInfo shaderModuleCreateInfo;
|
||||
shaderModuleCreateInfo.codeSize = (UIntPtr) bytecode.Length;
|
||||
shaderModuleCreateInfo.byteCode = (IntPtr) ptr;
|
||||
shaderModuleCreateInfo.codeSize = (nuint) stream.Length;
|
||||
shaderModuleCreateInfo.byteCode = (nint) bytecodeBuffer;
|
||||
|
||||
return Refresh.Refresh_CreateShaderModule(device.Handle, shaderModuleCreateInfo);
|
||||
}
|
||||
var shaderModule = Refresh.Refresh_CreateShaderModule(device.Handle, shaderModuleCreateInfo);
|
||||
|
||||
NativeMemory.Free(bytecodeBuffer);
|
||||
return shaderModule;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using System.Runtime.InteropServices;
|
||||
using RefreshCS;
|
||||
|
||||
namespace MoonWorks.Graphics
|
||||
|
@ -217,10 +218,9 @@ namespace MoonWorks.Graphics
|
|||
return texture;
|
||||
}
|
||||
|
||||
public static Texture LoadDDS(GraphicsDevice graphicsDevice, CommandBuffer commandBuffer, System.IO.Stream stream)
|
||||
{
|
||||
using (var reader = new BinaryReader(stream))
|
||||
public unsafe static Texture LoadDDS(GraphicsDevice graphicsDevice, CommandBuffer commandBuffer, System.IO.Stream stream)
|
||||
{
|
||||
using var reader = new BinaryReader(stream);
|
||||
Texture texture;
|
||||
int faces;
|
||||
ParseDDS(reader, out var format, out var width, out var height, out var levels, out var isCube);
|
||||
|
@ -243,22 +243,20 @@ namespace MoonWorks.Graphics
|
|||
var levelWidth = width >> j;
|
||||
var levelHeight = height >> j;
|
||||
|
||||
var pixels = reader.ReadBytes(
|
||||
Texture.CalculateDDSLevelSize(
|
||||
levelWidth,
|
||||
levelHeight,
|
||||
format
|
||||
)
|
||||
);
|
||||
var levelSize = CalculateDDSLevelSize(levelWidth, levelHeight, format);
|
||||
var byteBuffer = NativeMemory.Alloc((nuint) levelSize);
|
||||
var byteSpan = new Span<byte>(byteBuffer, levelSize);
|
||||
stream.ReadExactly(byteSpan);
|
||||
|
||||
var textureSlice = new TextureSlice(texture, new Rect(0, 0, levelWidth, levelHeight), 0, (uint) i, (uint) j);
|
||||
commandBuffer.SetTextureData(textureSlice, pixels);
|
||||
commandBuffer.SetTextureData(textureSlice, (nint) byteBuffer, (uint) levelSize);
|
||||
|
||||
NativeMemory.Free(byteBuffer);
|
||||
}
|
||||
}
|
||||
|
||||
return texture;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a 2D texture.
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
/* Heavily based on https://github.com/FNA-XNA/FNA/blob/master/src/Media/Xiph/VideoPlayer.cs */
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Runtime.InteropServices;
|
||||
using SDL2;
|
||||
|
||||
namespace MoonWorks.Video
|
||||
{
|
||||
|
@ -16,6 +18,7 @@ namespace MoonWorks.Video
|
|||
internal IntPtr Handle;
|
||||
private IntPtr rwData;
|
||||
private void* videoData;
|
||||
private int videoDataLength;
|
||||
|
||||
public double FramesPerSecond => fps;
|
||||
public int Width => yWidth;
|
||||
|
@ -31,16 +34,19 @@ namespace MoonWorks.Video
|
|||
|
||||
public Video(string filename)
|
||||
{
|
||||
if (!System.IO.File.Exists(filename))
|
||||
if (!File.Exists(filename))
|
||||
{
|
||||
throw new ArgumentException("Video file not found!");
|
||||
}
|
||||
|
||||
var bytes = System.IO.File.ReadAllBytes(filename);
|
||||
videoData = NativeMemory.Alloc((nuint) bytes.Length);
|
||||
Marshal.Copy(bytes, 0, (IntPtr) videoData, bytes.Length);
|
||||
rwData = SDL2.SDL.SDL_RWFromMem((IntPtr) videoData, bytes.Length);
|
||||
var fileStream = new FileStream(filename, FileMode.Open, FileAccess.Read);
|
||||
videoDataLength = (int) fileStream.Length;
|
||||
videoData = NativeMemory.Alloc((nuint) videoDataLength);
|
||||
var fileBufferSpan = new Span<byte>(videoData, videoDataLength);
|
||||
fileStream.ReadExactly(fileBufferSpan);
|
||||
fileStream.Close();
|
||||
|
||||
rwData = SDL.SDL_RWFromMem((IntPtr) videoData, videoDataLength);
|
||||
if (Theorafile.tf_open_callbacks(rwData, out Handle, callbacks) < 0)
|
||||
{
|
||||
throw new ArgumentException("Invalid video file!");
|
||||
|
@ -98,6 +104,7 @@ namespace MoonWorks.Video
|
|||
|
||||
// free unmanaged resources (unmanaged objects)
|
||||
Theorafile.tf_close(ref Handle);
|
||||
SDL.SDL_RWclose(rwData);
|
||||
NativeMemory.Free(videoData);
|
||||
|
||||
IsDisposed = true;
|
||||
|
|
Loading…
Reference in New Issue