ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zwinder buffer - when saving to disk, only save what has actually been put in the buffer

This commit is contained in:
nattthebear 2020-08-08 13:11:19 -04:00
parent 78b03cbdec
commit 5cbd1ed385
3 changed files with 77 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs
View File

@ -27,19 +27,19 @@ namespace BizHawk.Client.Common
_sizeMask = Size - 1;
_buffer = new byte[Size];
_targetFrameLength = settings.TargetFrameLength;
_states = new StateInfo[StateMask + 1];
_states = new StateInfo[STATEMASK + 1];
_useCompression = settings.UseCompression;
}
/// <summary>
/// Number of states that could be in the state ringbuffer, Mask for the state ringbuffer
/// </summary>
private const int StateMask = 16383;
private const int STATEMASK = 16383;
/// <summary>
/// How many states are actually in the state ringbuffer
/// </summary>
public int Count => (_nextStateIndex - _firstStateIndex) & StateMask;
public int Count => (_nextStateIndex - _firstStateIndex) & STATEMASK;
/// <summary>
/// total number of bytes used
@ -73,7 +73,7 @@ namespace BizHawk.Client.Common
private readonly StateInfo[] _states;
private int _firstStateIndex;
private int _nextStateIndex;
private int HeadStateIndex => (_nextStateIndex - 1) & StateMask;
private int HeadStateIndex => (_nextStateIndex - 1) & STATEMASK;
private readonly bool _useCompression;
@ -136,7 +136,7 @@ namespace BizHawk.Client.Common
if (Count == 0)
throw new IOException("A single state must not be larger than the buffer");
indexInvalidated?.Invoke(0);
_firstStateIndex = (_firstStateIndex + 1) & StateMask;
_firstStateIndex = (_firstStateIndex + 1) & STATEMASK;
return Count > 0
? (_states[_firstStateIndex].Start - start) & _sizeMask
: Size;
@ -156,7 +156,7 @@ namespace BizHawk.Client.Common
_states[_nextStateIndex].Frame = frame;
_states[_nextStateIndex].Start = start;
_states[_nextStateIndex].Size = (int)stream.Length;
_nextStateIndex = (_nextStateIndex + 1) & StateMask;
_nextStateIndex = (_nextStateIndex + 1) & STATEMASK;
Util.DebugWriteLine($"Size: {Size >> 20}MiB, Used: {Used >> 20}MiB, States: {Count}");
}
@ -196,7 +196,7 @@ namespace BizHawk.Client.Common
{
if ((uint)index >= (uint)Count)
throw new IndexOutOfRangeException();
return new StateInformation(this, (index + _firstStateIndex) & StateMask);
return new StateInformation(this, (index + _firstStateIndex) & STATEMASK);
}
/// <summary>
@ -207,7 +207,7 @@ namespace BizHawk.Client.Common
{
if ((uint)index > (uint)Count)
throw new IndexOutOfRangeException();
_nextStateIndex = (index + _firstStateIndex) & StateMask;
_nextStateIndex = (index + _firstStateIndex) & STATEMASK;
Util.DebugWriteLine($"Size: {Size >> 20}MiB, Used: {Used >> 20}MiB, States: {Count}");
}
@ -218,42 +218,43 @@ namespace BizHawk.Client.Common
writer.Write(_targetFrameLength);
writer.Write(_useCompression);
writer.Write(_buffer);
foreach (var s in _states)
{
writer.Write(s.Start);
writer.Write(s.Size);
writer.Write(s.Frame);
}
writer.Write(_firstStateIndex);
writer.Write(_nextStateIndex);
SaveStateBodyBinary(writer);
}
// public void LoadStateBinary(BinaryReader reader)
// {
// if (reader.ReadInt64() != Size)
// throw new InvalidOperationException("Bad format");
// if (reader.ReadInt64() != _sizeMask)
// throw new InvalidOperationException("Bad format");
// if (reader.ReadInt32() != _targetFrameLength)
// throw new InvalidOperationException("Bad format");
// if (reader.ReadBoolean() != _useCompression)
// throw new InvalidOperationException("Bad format");
// LoadStateBodyBinary(reader);
// }
private void SaveStateBodyBinary(BinaryWriter writer)
{
writer.Write(Count);
for (var i = _firstStateIndex; i != _nextStateIndex; i = (i + 1) & STATEMASK)
{
writer.Write(_states[i].Frame);
writer.Write(_states[i].Size);
}
if (Count != 0)
{
var startByte = _states[_firstStateIndex].Start;
var endByte = _states[HeadStateIndex].Start + _states[HeadStateIndex].Size;
if (startByte > endByte)
{
writer.BaseStream.Write(_buffer, (int)startByte, (int)(Size - startByte));
startByte = 0;
}
writer.BaseStream.Write(_buffer, (int)startByte, (int)(endByte - startByte));
}
}
private void LoadStateBodyBinary(BinaryReader reader)
{
reader.Read(_buffer, 0, _buffer.Length);
for (var i = 0; i < _states.Length; i++)
{
_states[i].Start = reader.ReadInt64();
_states[i].Size = reader.ReadInt32();
_states[i].Frame = reader.ReadInt32();
}
_firstStateIndex = reader.ReadInt32();
_firstStateIndex = 0;
_nextStateIndex = reader.ReadInt32();
long nextByte = 0;
for (var i = 0; i < _nextStateIndex; i++)
{
_states[i].Frame = reader.ReadInt32();
_states[i].Size = reader.ReadInt32();
_states[i].Start = nextByte;
nextByte += _states[i].Size;
}
reader.Read(_buffer, 0, (int)nextByte);
}
public static ZwinderBuffer Create(BinaryReader reader)

4
src/BizHawk.Common/SpanStream.cs
View File

@ -9,8 +9,8 @@ namespace BizHawk.Common
/// </summary>
public interface ISpanStream
{
void Write (ReadOnlySpan<byte> buffer);
int Read (Span<byte> buffer);
void Write(ReadOnlySpan<byte> buffer);
int Read(Span<byte> buffer);
}
public static class SpanStream
{

36
src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs
View File

@ -25,6 +25,42 @@ namespace BizHawk.Tests.Client.Common.Movie
Assert.AreEqual(zw.Settings.RecentBufferSize, zw2.Settings.RecentBufferSize);
}
[TestMethod]
public void SaveCreateBufferRoundTrip()
{
var buff = new ZwinderBuffer(new RewindConfig
{
UseCompression = false,
BufferSize = 1,
TargetFrameLength = 10
});
var ss = new StateSource { PaddingData = new byte[500] };
for (var frame = 0; frame < 2090; frame++)
{
ss.Frame = frame;
buff.Capture(frame, (s) => ss.SaveStateBinary(new BinaryWriter(s)));
}
// states are 504 bytes large, buffer is 1048576 bytes large
Assert.AreEqual(buff.Count, 2080);
Assert.AreEqual(buff.GetState(0).Frame, 10);
Assert.AreEqual(buff.GetState(2079).Frame, 2089);
Assert.AreEqual(StateSource.GetFrameNumberInState(buff.GetState(0).GetReadStream()), 10);
Assert.AreEqual(StateSource.GetFrameNumberInState(buff.GetState(2079).GetReadStream()), 2089);
var ms = new MemoryStream();
buff.SaveStateBinary(new BinaryWriter(ms));
ms.Position = 0;
var buff2 = ZwinderBuffer.Create(new BinaryReader(ms));
Assert.AreEqual(buff.Size, buff2.Size);
Assert.AreEqual(buff.Used, buff2.Used);
Assert.AreEqual(buff2.Count, 2080);
Assert.AreEqual(buff2.GetState(0).Frame, 10);
Assert.AreEqual(buff2.GetState(2079).Frame, 2089);
Assert.AreEqual(StateSource.GetFrameNumberInState(buff2.GetState(0).GetReadStream()), 10);
Assert.AreEqual(StateSource.GetFrameNumberInState(buff2.GetState(2079).GetReadStream()), 2089);
}
[TestMethod]
public void SomethingSomething()
{