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

IBinaryStream migration - continued.

Browse Source
This commit is contained in:
morkt
2016-10-15 12:21:12 +04:00
parent 503b734645
commit d0c1d5da01
39 changed files with 529 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ArcFormats/Cri/AudioADX.cs
View File

@@ -38,21 +38,21 @@ namespace GameRes.Formats.Cri
public override string Description { get { return "CRI MiddleWare ADPCM audio"; } }
public override uint Signature { get { return 0; } }
public override SoundInput TryOpen (Stream file)
public override SoundInput TryOpen (IBinaryStream file)
{
uint signature = FormatCatalog.ReadSignature (file);
uint signature = file.Signature;
if (0x80 != (signature & 0xFFFF))
return null;
uint header_size = Binary.BigEndian (signature & 0xFFFF0000);
if (header_size < 0x10 || header_size >= file.Length)
return null;
var header = new byte[header_size];
if (header.Length != file.Read (header, 0, header.Length))
var header = file.ReadBytes (header_size);
if (header.Length != header_size)
return null;
if (!Binary.AsciiEqual (header, header.Length-6, "(c)CRI"))
return null;
return new AdxInput (file, header);
return new AdxInput (file.AsStream, header);
}
}

4
ArcFormats/Cri/AudioHCA.cs
View File

@@ -49,9 +49,9 @@ namespace GameRes.Formats.Cri
static readonly Tuple<uint, uint> DefaultKey = Tuple.Create (0x30DBE1ABu, 0xCC554639u);
public override SoundInput TryOpen (Stream file)
public override SoundInput TryOpen (IBinaryStream file)
{
return new HcaInput (file, ConversionFormat.IeeeFloat, DefaultKey);
return new HcaInput (file.AsStream, ConversionFormat.IeeeFloat, DefaultKey);
}
}

16
ArcFormats/Cri/ImageSPC.cs
View File

@@ -42,22 +42,24 @@ namespace GameRes.Formats.Cri
Signatures = new uint[] { 0 };
}
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
uint unpacked_size = FormatCatalog.ReadSignature (stream);
uint unpacked_size = stream.Signature;
if (unpacked_size <= 0x20 || unpacked_size > 0x5000000) // ~83MB
return null;
using (var lzss = new LzssStream (stream, LzssMode.Decompress, true))
using (var lzss = new LzssStream (stream.AsStream, LzssMode.Decompress, true))
using (var input = new SeekableStream (lzss))
return base.ReadMetaData (input);
using (var xtx = new BinaryStream (input))
return base.ReadMetaData (xtx);
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
stream.Position = 4;
using (var lzss = new LzssStream (stream, LzssMode.Decompress, true))
using (var lzss = new LzssStream (stream.AsStream, LzssMode.Decompress, true))
using (var input = new SeekableStream (lzss))
return base.Read (input, info);
using (var xtx = new BinaryStream (input))
return base.Read (xtx, info);
}
public override void Write (Stream file, ImageData image)

10
ArcFormats/Cri/ImageXTX.cs
View File

@@ -51,11 +51,9 @@ namespace GameRes.Formats.Cri
Signatures = new uint[] { 0x00787478, 0 };
}
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
var header = new byte[0x20];
if (0x20 != stream.Read (header, 0, 0x20))
return null;
var header = stream.ReadHeader (0x20).ToArray();
if (!Binary.AsciiEqual (header, 0, "xtx\0"))
{
var header_size = LittleEndian.ToUInt32 (header, 0);
@@ -87,9 +85,9 @@ namespace GameRes.Formats.Cri
};
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var reader = new XtxReader (stream, (XtxMetaData)info);
var reader = new XtxReader (stream.AsStream, (XtxMetaData)info);
var pixels = reader.Unpack();
return ImageData.Create (info, reader.Format, null, pixels);
}