epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use spans to improve performance in StreamExts.

Browse Source 
Also avoid ReadBytes calls that allocate a buffer by either updating the stream position (if not interested in the bytes), by reusing an input buffer (if interested in the bytes), or using a stackalloc buffer to avoid the allocation (for small reads).
This commit is contained in:
RoosterDragon
2023-09-19 18:10:09 +01:00
committed by Gustas
parent b3ee3551ca
commit 5d91b678bb
20 changed files with 153 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Common/AudioLoaders/OggLoader.cs
View File

@@ -76,9 +76,7 @@ namespace OpenRA.Mods.Common.AudioLoaders
{
readonly OggFormat format;
// This buffer can be static because it can only be used by 1 instance per thread.
[ThreadStatic]
static float[] conversionBuffer;
float[] conversionBuffer;
public OggStream(OggFormat format)
{
@@ -105,13 +103,10 @@ namespace OpenRA.Mods.Common.AudioLoaders
// Make sure we don't have an odd count.
count -= count % format.reader.Channels;
// Get the buffer, creating a new one if none exists or the existing one is too small.
var floatBuffer = conversionBuffer ??= new float[count];
if (floatBuffer.Length < count)
floatBuffer = conversionBuffer = new float[count];
var floatBuffer = EnsureArraySize(ref conversionBuffer, count);
// Let NVorbis do the actual reading.
var samples = format.reader.ReadSamples(floatBuffer, offset, count);
var samples = format.reader.ReadSamples(floatBuffer);
// Move the data back to the request buffer and convert to 16-bit signed samples for OpenAL.
for (var i = 0; i < samples; i++)
@@ -137,6 +132,13 @@ namespace OpenRA.Mods.Common.AudioLoaders
base.Dispose(disposing);
}
static Span<float> EnsureArraySize(ref float[] array, int desiredSize)
{
if (array == null || array.Length < desiredSize)
array = new float[desiredSize];
return array.AsSpan(..desiredSize);
}
}
}
}