mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
[ARC] Implement support for compression method 3 (pack).
This commit is contained in:
@@ -148,12 +148,17 @@ public sealed partial class Arc
|
|||||||
|
|
||||||
if((int)_entries[entryNumber].Method >= 20) return ErrorNumber.InvalidArgument;
|
if((int)_entries[entryNumber].Method >= 20) return ErrorNumber.InvalidArgument;
|
||||||
|
|
||||||
|
if(_entries[entryNumber].Method > Method.Pack) return ErrorNumber.NotSupported;
|
||||||
|
|
||||||
Stream stream = new OffsetStream(new NonClosableStream(_stream),
|
Stream stream = new OffsetStream(new NonClosableStream(_stream),
|
||||||
_entries[entryNumber].DataOffset,
|
_entries[entryNumber].DataOffset,
|
||||||
_entries[entryNumber].DataOffset + _entries[entryNumber].Compressed);
|
_entries[entryNumber].DataOffset + _entries[entryNumber].Compressed);
|
||||||
|
|
||||||
if(_entries[entryNumber].Uncompressed == 0) stream = new MemoryStream([]);
|
if(_entries[entryNumber].Uncompressed == 0) stream = new MemoryStream([]);
|
||||||
|
|
||||||
|
if(_entries[entryNumber].Method == Method.Pack)
|
||||||
|
stream = new PackStream(stream, _entries[entryNumber].Uncompressed);
|
||||||
|
|
||||||
filter = new ZZZNoFilter();
|
filter = new ZZZNoFilter();
|
||||||
ErrorNumber errno = filter.Open(stream);
|
ErrorNumber errno = filter.Open(stream);
|
||||||
|
|
||||||
@@ -163,5 +168,6 @@ public sealed partial class Arc
|
|||||||
|
|
||||||
return errno;
|
return errno;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
@@ -40,6 +40,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="ADC.cs"/>
|
<Compile Include="ADC.cs"/>
|
||||||
<Compile Include="AppleRle.cs"/>
|
<Compile Include="AppleRle.cs"/>
|
||||||
|
<Compile Include="Arc\PackStream.cs"/>
|
||||||
<Compile Include="BZip2.cs"/>
|
<Compile Include="BZip2.cs"/>
|
||||||
<Compile Include="FLAC.cs"/>
|
<Compile Include="FLAC.cs"/>
|
||||||
<Compile Include="Lh5Stream.cs"/>
|
<Compile Include="Lh5Stream.cs"/>
|
||||||
|
|||||||
108
Aaru.Compression/Arc/PackStream.cs
Normal file
108
Aaru.Compression/Arc/PackStream.cs
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace Aaru.Compression;
|
||||||
|
|
||||||
|
public partial class PackStream : Stream
|
||||||
|
{
|
||||||
|
readonly byte[] _decoded;
|
||||||
|
readonly long _length;
|
||||||
|
long _position;
|
||||||
|
|
||||||
|
public PackStream(Stream compressedStream, long decompressedLength)
|
||||||
|
{
|
||||||
|
if(compressedStream == null) throw new ArgumentNullException(nameof(compressedStream));
|
||||||
|
if(!compressedStream.CanRead) throw new ArgumentException("Stream must be readable", nameof(compressedStream));
|
||||||
|
if(decompressedLength < 0) throw new ArgumentOutOfRangeException(nameof(decompressedLength));
|
||||||
|
|
||||||
|
// Read full compressed data into memory
|
||||||
|
compressedStream.Position = 0;
|
||||||
|
byte[] inBuf = new byte[compressedStream.Length];
|
||||||
|
compressedStream.ReadExactly(inBuf, 0, inBuf.Length);
|
||||||
|
|
||||||
|
// Allocate output buffer
|
||||||
|
_decoded = new byte[decompressedLength];
|
||||||
|
nint outLen = (nint)decompressedLength;
|
||||||
|
|
||||||
|
// Call native decompressor
|
||||||
|
int err = arc_decompress_pack(inBuf, inBuf.Length, _decoded, ref outLen);
|
||||||
|
|
||||||
|
if(err != 0) throw new InvalidOperationException("LH5 decompression failed");
|
||||||
|
|
||||||
|
// Adjust actual length in case it differs
|
||||||
|
_length = outLen;
|
||||||
|
_position = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool CanRead => true;
|
||||||
|
public override bool CanSeek => true;
|
||||||
|
public override bool CanWrite => false;
|
||||||
|
public override long Length => _length;
|
||||||
|
|
||||||
|
public override long Position
|
||||||
|
{
|
||||||
|
get => _position;
|
||||||
|
set => Seek(value, SeekOrigin.Begin);
|
||||||
|
}
|
||||||
|
|
||||||
|
[LibraryImport("libAaru.Compression.Native")]
|
||||||
|
public static partial int arc_decompress_pack(byte[] in_buf, nint in_len, byte[] out_buf, ref nint out_len);
|
||||||
|
|
||||||
|
public override void Flush()
|
||||||
|
{
|
||||||
|
// no-op
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Reads up to <paramref name="count" /> bytes from the decompressed buffer
|
||||||
|
/// into <paramref name="buffer" />, starting at <paramref name="offset" />.
|
||||||
|
/// </summary>
|
||||||
|
public override int Read(byte[] buffer, int offset, int count)
|
||||||
|
{
|
||||||
|
if(buffer == null) throw new ArgumentNullException(nameof(buffer));
|
||||||
|
if(offset < 0) throw new ArgumentOutOfRangeException(nameof(offset));
|
||||||
|
if(count < 0) throw new ArgumentOutOfRangeException(nameof(count));
|
||||||
|
if(offset + count > buffer.Length) throw new ArgumentException("offset+count exceeds buffer length");
|
||||||
|
|
||||||
|
long remaining = _length - _position;
|
||||||
|
|
||||||
|
if(remaining <= 0) return 0;
|
||||||
|
|
||||||
|
int toRead = (int)Math.Min(count, remaining);
|
||||||
|
Array.Copy(_decoded, _position, buffer, offset, toRead);
|
||||||
|
_position += toRead;
|
||||||
|
|
||||||
|
return toRead;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sets the current position within the decompressed buffer.
|
||||||
|
/// </summary>
|
||||||
|
public override long Seek(long offset, SeekOrigin origin)
|
||||||
|
{
|
||||||
|
long newPos = origin switch
|
||||||
|
{
|
||||||
|
SeekOrigin.Begin => offset,
|
||||||
|
SeekOrigin.Current => _position + offset,
|
||||||
|
SeekOrigin.End => _length + offset,
|
||||||
|
_ => throw new ArgumentException("Invalid SeekOrigin", nameof(origin))
|
||||||
|
};
|
||||||
|
|
||||||
|
if(newPos < 0 || newPos > _length) throw new IOException("Attempt to seek outside the buffer");
|
||||||
|
|
||||||
|
_position = newPos;
|
||||||
|
|
||||||
|
return _position;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void SetLength(long value)
|
||||||
|
{
|
||||||
|
throw new NotSupportedException("Cannot resize decompressed buffer");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Write(byte[] buffer, int offset, int count)
|
||||||
|
{
|
||||||
|
throw new NotSupportedException("Stream is read-only");
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user