lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(Entis): improved ErisaN compression handling.

Browse Source
This commit is contained in:
morkt
2018-09-07 15:47:10 +04:00
parent cc6747c537
commit e1771edc81
2 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ArcFormats/Entis/ErisaNemesis.cs
View File

@@ -5,6 +5,7 @@
using System;
using System.Diagnostics;
using System.IO;
namespace GameRes.Formats.Entis
{
@@ -64,17 +65,16 @@ namespace GameRes.Formats.Entis
public override uint DecodeBytes (Array ptrDst, uint nCount)
{
return DecodeNemesisCodeBytes (ptrDst as byte[], nCount);
return DecodeNemesisCodeBytes (ptrDst as byte[], 0, nCount);
}
public uint DecodeNemesisCodeBytes (byte[] ptrDst, uint nCount)
public uint DecodeNemesisCodeBytes (byte[] ptrDst, int dst, uint nCount)
{
if (m_flagEOF)
return 0;
ErisaProbBase pBase = m_pProbERISA;
uint nDecoded = 0;
int dst = 0;
byte bytSymbol;
while (nDecoded < nCount)
{
@@ -150,7 +150,6 @@ namespace GameRes.Formats.Entis
if (nSymbol != ErisaProbModel.EscCode)
{
pModel.AddSymbol ((short)nSymbol);
iSym = -1;
}
else
{
@@ -214,7 +213,7 @@ namespace GameRes.Formats.Entis
if ((pBase.dwWorkUsed < ErisaProbBase.SlotMax) && (iDeg < 4))
{
int iSymbol = ((byte)nSymbol) >> ErisaProbBase.m_nShiftCount[iDeg];
int iSymbol = bytSymbol >> ErisaProbBase.m_nShiftCount[iDeg];
if (iSymbol >= ErisaProbModel.SubSortMax)
throw new InvalidFormatException ("Invalid Nemesis encoding sequence");
if (++pModel.SubModel[iSymbol].Occured >= ErisaProbBase.m_nNewProbLimit[iDeg])
@@ -295,4 +294,45 @@ namespace GameRes.Formats.Entis
public uint first;
public uint[] index = new uint[Nemesis.IndexLimit];
}
internal class ErisaNemesisStream : InputProxyStream
{
NemesisDecodeContext m_decoder;
int m_remaining;
bool m_eof = false;
public ErisaNemesisStream (Stream input, int output_length = 0) : base (input)
{
m_decoder = new NemesisDecodeContext();
m_decoder.AttachInputFile (input);
m_decoder.PrepareToDecodeERISANCode();
m_remaining = output_length > 0 ? output_length : int.MaxValue;
}
public override int Read (byte[] buffer, int offset, int count)
{
int read = 0;
if (!m_eof && m_remaining > 0)
{
uint chunk_size = (uint)Math.Min (count, m_remaining);
read = (int)m_decoder.DecodeNemesisCodeBytes (buffer, offset, chunk_size);
m_eof = read < count;
m_remaining -= read;
}
return read;
}
public override bool CanSeek { get { return false; } }
public override long Length { get { throw new NotSupportedException(); } }
public override long Position {
get { throw new NotSupportedException(); }
set { throw new NotSupportedException(); }
}
public override long Seek (long offset, SeekOrigin origin)
{
throw new NotSupportedException();
}
}
}