mirror of
https://github.com/crskycode/GARbro.git
synced 2024-12-24 03:44:13 +08:00
(ArcView.ArcStream): added bufferization.
This commit is contained in:
parent
2c7b82535e
commit
68aad58569
@ -24,6 +24,7 @@
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.IO.MemoryMappedFiles;
|
||||
using System.Runtime.InteropServices;
|
||||
@ -462,6 +463,11 @@ namespace GameRes
|
||||
return ReadString (offset, size, Encodings.cp932);
|
||||
}
|
||||
|
||||
public unsafe ViewPointer GetPointer ()
|
||||
{
|
||||
return new ViewPointer (m_view, m_offset);
|
||||
}
|
||||
|
||||
#region IDisposable Members
|
||||
bool disposed = false;
|
||||
|
||||
@ -489,10 +495,15 @@ namespace GameRes
|
||||
|
||||
public class ArcStream : Stream, IBinaryStream
|
||||
{
|
||||
private Frame m_view;
|
||||
private long m_start;
|
||||
private long m_size;
|
||||
private readonly Frame m_view;
|
||||
private readonly long m_start;
|
||||
private readonly long m_size;
|
||||
private long m_position;
|
||||
private byte[] m_buffer;
|
||||
private int m_buffer_pos; // read position within buffer
|
||||
private int m_buffer_len; // length of bytes read in buffer
|
||||
|
||||
private const int DefaultBufferSize = 0x1000;
|
||||
|
||||
public string Name { get; set; }
|
||||
public uint Signature { get { return ReadSignature(); } }
|
||||
@ -504,8 +515,21 @@ namespace GameRes
|
||||
public override long Length { get { return m_size; } }
|
||||
public override long Position
|
||||
{
|
||||
get { return m_position; }
|
||||
set { m_position = Math.Max (value, 0); }
|
||||
get { return m_position + (m_buffer_pos - m_buffer_len); }
|
||||
set {
|
||||
if (value < 0)
|
||||
throw new ArgumentOutOfRangeException ("value", "Stream position is out of range.");
|
||||
var buffer_start = m_position - m_buffer_len;
|
||||
if (m_buffer_pos != m_buffer_len && value >= buffer_start && value < m_position)
|
||||
{
|
||||
m_buffer_pos = (int)(value - buffer_start);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_position = value;
|
||||
m_buffer_pos = m_buffer_len = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public ArcStream (ArcView file)
|
||||
@ -569,18 +593,61 @@ namespace GameRes
|
||||
return new CowArray<byte> (m_header, 0, size);
|
||||
}
|
||||
|
||||
private void RefillBuffer ()
|
||||
{
|
||||
if (null == m_buffer)
|
||||
m_buffer = new byte[DefaultBufferSize];
|
||||
uint length = (uint)Math.Min (m_size - m_position, m_buffer.Length);
|
||||
m_buffer_len = m_view.Read (m_start + m_position, m_buffer, 0, length);
|
||||
m_position += m_buffer_len;
|
||||
m_buffer_pos = 0;
|
||||
}
|
||||
|
||||
private void FlushBuffer ()
|
||||
{
|
||||
if (m_buffer_len != 0)
|
||||
{
|
||||
m_position += m_buffer_pos - m_buffer_len;
|
||||
m_buffer_pos = m_buffer_len = 0;
|
||||
}
|
||||
}
|
||||
|
||||
private void EnsureAvailable (int length)
|
||||
{
|
||||
if (m_buffer_pos + length > m_buffer_len)
|
||||
{
|
||||
FlushBuffer();
|
||||
if (m_position + length > m_size)
|
||||
throw new EndOfStreamException();
|
||||
RefillBuffer();
|
||||
}
|
||||
}
|
||||
|
||||
private int ReadFromBuffer (byte[] array, int offset, int count)
|
||||
{
|
||||
int available = Math.Min (m_buffer_len - m_buffer_pos, count);
|
||||
if (available > 0)
|
||||
{
|
||||
Buffer.BlockCopy (m_buffer, m_buffer_pos, array, offset, available);
|
||||
m_buffer_pos += available;
|
||||
}
|
||||
return available;
|
||||
}
|
||||
|
||||
public int PeekByte ()
|
||||
{
|
||||
if (m_position >= m_size)
|
||||
if (m_buffer_pos == m_buffer_len)
|
||||
RefillBuffer();
|
||||
if (m_buffer_pos == m_buffer_len)
|
||||
return -1;
|
||||
return m_view.ReadByte (m_start+m_position);
|
||||
return m_buffer[m_buffer_pos];
|
||||
}
|
||||
|
||||
public override int ReadByte ()
|
||||
{
|
||||
int b = PeekByte();
|
||||
if (-1 != b)
|
||||
++m_position;
|
||||
++m_buffer_pos;
|
||||
return b;
|
||||
}
|
||||
|
||||
@ -599,10 +666,9 @@ namespace GameRes
|
||||
|
||||
public short ReadInt16 ()
|
||||
{
|
||||
if (m_position + 2 > m_size)
|
||||
throw new EndOfStreamException();
|
||||
var v = m_view.ReadInt16 (m_start+m_position);
|
||||
m_position += 2;
|
||||
EnsureAvailable (2);
|
||||
var v = m_buffer.ToInt16 (m_buffer_pos);
|
||||
m_buffer_pos += 2;
|
||||
return v;
|
||||
}
|
||||
|
||||
@ -613,20 +679,17 @@ namespace GameRes
|
||||
|
||||
public int ReadInt24 ()
|
||||
{
|
||||
if (m_position + 3 > m_size)
|
||||
throw new EndOfStreamException();
|
||||
int v = m_view.ReadUInt16 (m_start+m_position);
|
||||
v |= m_view.ReadByte (m_start+m_position+2) << 16;
|
||||
m_position += 3;
|
||||
EnsureAvailable (3);
|
||||
int v = m_buffer.ToInt24 (m_buffer_pos);
|
||||
m_buffer_pos += 3;
|
||||
return v;
|
||||
}
|
||||
|
||||
public int ReadInt32 ()
|
||||
{
|
||||
if (m_position + 4 > m_size)
|
||||
throw new EndOfStreamException();
|
||||
var v = m_view.ReadInt32 (m_start+m_position);
|
||||
m_position += 4;
|
||||
EnsureAvailable (4);
|
||||
int v = m_buffer.ToInt32 (m_buffer_pos);
|
||||
m_buffer_pos += 4;
|
||||
return v;
|
||||
}
|
||||
|
||||
@ -637,10 +700,9 @@ namespace GameRes
|
||||
|
||||
public long ReadInt64 ()
|
||||
{
|
||||
if (m_position + 8 > m_size)
|
||||
throw new EndOfStreamException();
|
||||
var v = m_view.ReadInt64 (m_start+m_position);
|
||||
m_position += 8;
|
||||
EnsureAvailable (8);
|
||||
var v = m_buffer.ToInt64 (m_buffer_pos);
|
||||
m_buffer_pos += 8;
|
||||
return v;
|
||||
}
|
||||
|
||||
@ -649,8 +711,6 @@ namespace GameRes
|
||||
return (ulong)ReadInt64();
|
||||
}
|
||||
|
||||
byte[] m_string_buf;
|
||||
|
||||
public string ReadCString (int length)
|
||||
{
|
||||
return ReadCString (length, Encodings.cp932);
|
||||
@ -658,11 +718,39 @@ namespace GameRes
|
||||
|
||||
public string ReadCString (int length, Encoding enc)
|
||||
{
|
||||
if (null == m_string_buf || m_string_buf.Length < length)
|
||||
m_string_buf = new byte[Math.Max (length, 0x20)];
|
||||
|
||||
length = Read (m_string_buf, 0, length);
|
||||
return Binary.GetCString (m_string_buf, 0, length);
|
||||
if (m_buffer_pos == m_buffer_len && length <= DefaultBufferSize)
|
||||
RefillBuffer();
|
||||
if (m_buffer_pos + length <= m_buffer_len)
|
||||
{
|
||||
// whole string fit into buffer
|
||||
var str = Binary.GetCString (m_buffer, m_buffer_pos, length, enc);
|
||||
m_buffer_pos += length;
|
||||
return str;
|
||||
}
|
||||
else if (length > DefaultBufferSize)
|
||||
{
|
||||
// requested string length is larger than internal buffer size
|
||||
var string_buffer = ReadBytes (length);
|
||||
return Binary.GetCString (string_buffer, 0, string_buffer.Length, enc);
|
||||
}
|
||||
else
|
||||
{
|
||||
int available = m_buffer_len - m_buffer_pos;
|
||||
if (available > 0 && m_buffer_pos != 0)
|
||||
Buffer.BlockCopy (m_buffer, m_buffer_pos, m_buffer, 0, available);
|
||||
else if (null == m_buffer)
|
||||
m_buffer = new byte[DefaultBufferSize];
|
||||
int count = (int)Math.Min (m_buffer.Length - available, m_size - m_position);
|
||||
if (count > 0)
|
||||
{
|
||||
int read = m_view.Read (m_start + m_position, m_buffer, available, (uint)count);
|
||||
m_position += read;
|
||||
available += read;
|
||||
}
|
||||
m_buffer_len = available;
|
||||
m_buffer_pos = Math.Min (length, m_buffer_len);
|
||||
return Binary.GetCString (m_buffer, 0, m_buffer_pos, enc);
|
||||
}
|
||||
}
|
||||
|
||||
public string ReadCString ()
|
||||
@ -672,48 +760,95 @@ namespace GameRes
|
||||
|
||||
public string ReadCString (Encoding enc)
|
||||
{
|
||||
if (null == m_string_buf)
|
||||
m_string_buf = new byte[0x20];
|
||||
int size = 0;
|
||||
if (m_buffer_pos == m_buffer_len)
|
||||
RefillBuffer();
|
||||
int available = m_buffer_len - m_buffer_pos;
|
||||
if (0 == available)
|
||||
return string.Empty;
|
||||
|
||||
int zero = Array.IndexOf<byte> (m_buffer, 0, m_buffer_pos, available);
|
||||
if (zero != -1)
|
||||
{
|
||||
// null byte found within buffer
|
||||
var str = enc.GetString (m_buffer, m_buffer_pos, zero - m_buffer_pos);
|
||||
m_buffer_pos = zero+1;
|
||||
return str;
|
||||
}
|
||||
// underlying view includes whole stream
|
||||
if (m_view.Offset <= m_start && m_view.Offset + m_view.Reserved >= m_start + m_size)
|
||||
return ReadCStringUnsafe (enc, available);
|
||||
|
||||
var string_buf = new byte[Math.Max (0x20, available * 2)];
|
||||
ReadFromBuffer (string_buf, 0, available);
|
||||
int size = available;
|
||||
for (;;)
|
||||
{
|
||||
int b = ReadByte();
|
||||
if (-1 == b || 0 == b)
|
||||
break;
|
||||
if (m_string_buf.Length == size)
|
||||
if (string_buf.Length == size)
|
||||
{
|
||||
Array.Resize (ref m_string_buf, checked(size*3/2));
|
||||
Array.Resize (ref string_buf, checked(size*3/2));
|
||||
}
|
||||
m_string_buf[size++] = (byte)b;
|
||||
string_buf[size++] = (byte)b;
|
||||
}
|
||||
return enc.GetString (string_buf, 0, size);
|
||||
}
|
||||
|
||||
private unsafe string ReadCStringUnsafe (Encoding enc, int skip_bytes = 0)
|
||||
{
|
||||
Debug.Assert (m_view.Offset + m_view.Reserved >= m_start + m_size);
|
||||
FlushBuffer();
|
||||
using (var ptr = m_view.GetPointer())
|
||||
{
|
||||
byte* s = ptr.Value + (m_start - m_view.Offset + m_position);
|
||||
int view_length = (int)(m_size - m_position);
|
||||
int string_length = Math.Min (skip_bytes, view_length);
|
||||
while (string_length < view_length && 0 != s[string_length])
|
||||
{
|
||||
++string_length;
|
||||
}
|
||||
m_position += string_length;
|
||||
if (string_length < view_length)
|
||||
++m_position;
|
||||
// return enc.GetString (s, string_length); // .Net v4.6+ only
|
||||
var string_buf = new byte[string_length];
|
||||
Marshal.Copy ((IntPtr)s, string_buf, 0, string_length);
|
||||
return enc.GetString (string_buf, 0, string_length);
|
||||
}
|
||||
return enc.GetString (m_string_buf, 0, size);
|
||||
}
|
||||
|
||||
public byte[] ReadBytes (int count)
|
||||
{
|
||||
if (m_position >= m_size)
|
||||
if (m_buffer_pos + count <= m_buffer_len && m_buffer_len != 0)
|
||||
{
|
||||
var data = new CowArray<byte> (m_buffer, m_buffer_pos, count).ToArray();
|
||||
m_buffer_pos += count;
|
||||
return data;
|
||||
}
|
||||
var current_pos = Position;
|
||||
if (0 == count || current_pos >= m_size)
|
||||
return new byte[0];
|
||||
var bytes = m_view.ReadBytes (m_start+m_position, (uint)Math.Min (count, m_size - m_position));
|
||||
m_position += bytes.Length;
|
||||
var bytes = m_view.ReadBytes (m_start+current_pos, (uint)Math.Min (count, m_size - current_pos));
|
||||
Position = current_pos + bytes.Length;
|
||||
return bytes;
|
||||
}
|
||||
|
||||
#region System.IO.Stream methods
|
||||
public override void Flush()
|
||||
{
|
||||
FlushBuffer();
|
||||
}
|
||||
|
||||
public override long Seek (long offset, SeekOrigin origin)
|
||||
{
|
||||
switch (origin)
|
||||
{
|
||||
case SeekOrigin.Begin: m_position = offset; break;
|
||||
case SeekOrigin.Current: m_position += offset; break;
|
||||
case SeekOrigin.End: m_position = m_size + offset; break;
|
||||
case SeekOrigin.Begin: Position = offset; break;
|
||||
case SeekOrigin.Current: Position += offset; break;
|
||||
case SeekOrigin.End: Position = m_size + offset; break;
|
||||
}
|
||||
if (m_position < 0)
|
||||
m_position = 0;
|
||||
return m_position;
|
||||
return Position;
|
||||
}
|
||||
|
||||
public override void SetLength (long length)
|
||||
@ -723,12 +858,26 @@ namespace GameRes
|
||||
|
||||
public override int Read (byte[] buffer, int offset, int count)
|
||||
{
|
||||
if (m_position >= m_size)
|
||||
return 0;
|
||||
count = (int)Math.Min (count, m_size - m_position);
|
||||
int read = m_view.Read (m_start + m_position, buffer, offset, (uint)count);
|
||||
m_position += read;
|
||||
return read;
|
||||
int read_from_buffer = ReadFromBuffer (buffer, offset, count);
|
||||
offset += read_from_buffer;
|
||||
count -= read_from_buffer;
|
||||
if (0 == count || m_position >= m_size)
|
||||
return read_from_buffer;
|
||||
if (count < DefaultBufferSize)
|
||||
{
|
||||
RefillBuffer();
|
||||
count = Math.Min (count, m_buffer_len);
|
||||
Buffer.BlockCopy (m_buffer, m_buffer_pos, buffer, offset, count);
|
||||
m_buffer_pos += count;
|
||||
return read_from_buffer + count;
|
||||
}
|
||||
else
|
||||
{
|
||||
uint view_count = (uint)Math.Min (count, m_size - m_position);
|
||||
int read_from_view = m_view.Read (m_start + m_position, buffer, offset, view_count);
|
||||
m_position += read_from_view;
|
||||
return read_from_buffer + read_from_view;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Write (byte[] buffer, int offset, int count)
|
||||
|
Loading…
x
Reference in New Issue
Block a user