aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply nocompress option in dicformat for sector prefix, suffix and subchannel blocks.

Browse Source
This commit is contained in:
Natalia Portillo
2018-02-02 22:21:29 +00:00
parent 448d55b547
commit 88bef522bf
1 changed files with 110 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
DiscImageChef.DiscImages/DiscImageChef.cs
View File

@@ -3626,21 +3626,34 @@ namespace DiscImageChef.DiscImages
identifier = BlockType.DataBlock, identifier = BlockType.DataBlock,
type = DataType.CdSectorPrefix, type = DataType.CdSectorPrefix,
length = (uint)sectorPrefix.Length, length = (uint)sectorPrefix.Length,
crc64 = BitConverter.ToUInt64(blockCrc, 0) crc64 = BitConverter.ToUInt64(blockCrc, 0),
sectorSize = 16
}; };
byte[] lzmaProperties = null;
if(nocompress)
{
prefixBlock.compression = CompressionType.None;
prefixBlock.cmpCrc64 = prefixBlock.crc64;
prefixBlock.cmpLength = prefixBlock.length;
blockStream = new MemoryStream(sectorPrefix);
}
else
{
blockStream = new MemoryStream();
lzmaBlockStream = new LzmaStream(lzmaEncoderProperties, false, blockStream);
lzmaBlockStream.Write(sectorPrefix, 0, sectorPrefix.Length);
lzmaProperties = lzmaBlockStream.Properties;
lzmaBlockStream.Close();
blockStream = new MemoryStream(); Crc64Context.Data(blockStream.ToArray(), out blockCrc);
lzmaBlockStream = new LzmaStream(lzmaEncoderProperties, false, blockStream); prefixBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH;
lzmaBlockStream.Write(sectorPrefix, 0, sectorPrefix.Length); prefixBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0);
byte[] lzmaProperties = lzmaBlockStream.Properties; prefixBlock.compression = CompressionType.Lzma;
lzmaBlockStream.Close();
Crc64Context.Data(blockStream.ToArray(), out blockCrc); lzmaBlockStream = null;
prefixBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH; }
prefixBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0);
prefixBlock.compression = CompressionType.Lzma;
lzmaBlockStream = null;
structurePointer = Marshal.AllocHGlobal(Marshal.SizeOf(prefixBlock)); structurePointer = Marshal.AllocHGlobal(Marshal.SizeOf(prefixBlock));
structureBytes = new byte[Marshal.SizeOf(prefixBlock)]; structureBytes = new byte[Marshal.SizeOf(prefixBlock)];
@@ -3651,6 +3664,7 @@ namespace DiscImageChef.DiscImages
if(prefixBlock.compression == CompressionType.Lzma) if(prefixBlock.compression == CompressionType.Lzma)
imageStream.Write(lzmaProperties, 0, lzmaProperties.Length); imageStream.Write(lzmaProperties, 0, lzmaProperties.Length);
imageStream.Write(blockStream.ToArray(), 0, (int)blockStream.Length); imageStream.Write(blockStream.ToArray(), 0, (int)blockStream.Length);
index.RemoveAll(t => t.blockType == BlockType.DataBlock && index.RemoveAll(t => t.blockType == BlockType.DataBlock &&
t.dataType == DataType.CdSectorPrefix); t.dataType == DataType.CdSectorPrefix);
@@ -3674,21 +3688,32 @@ namespace DiscImageChef.DiscImages
identifier = BlockType.DataBlock, identifier = BlockType.DataBlock,
type = DataType.CdSectorSuffix, type = DataType.CdSectorSuffix,
length = (uint)sectorSuffix.Length, length = (uint)sectorSuffix.Length,
crc64 = BitConverter.ToUInt64(blockCrc, 0) crc64 = BitConverter.ToUInt64(blockCrc, 0),
sectorSize = 288
}; };
blockStream = new MemoryStream(); if(nocompress)
lzmaBlockStream = new LzmaStream(lzmaEncoderProperties, false, blockStream); {
lzmaBlockStream.Write(sectorSuffix, 0, sectorSuffix.Length); prefixBlock.compression = CompressionType.None;
lzmaProperties = lzmaBlockStream.Properties; prefixBlock.cmpCrc64 = prefixBlock.crc64;
lzmaBlockStream.Close(); prefixBlock.cmpLength = prefixBlock.length;
blockStream = new MemoryStream(sectorSuffix);
}
else
{
blockStream = new MemoryStream();
lzmaBlockStream = new LzmaStream(lzmaEncoderProperties, false, blockStream);
lzmaBlockStream.Write(sectorSuffix, 0, sectorSuffix.Length);
lzmaProperties = lzmaBlockStream.Properties;
lzmaBlockStream.Close();
Crc64Context.Data(blockStream.ToArray(), out blockCrc); Crc64Context.Data(blockStream.ToArray(), out blockCrc);
prefixBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH; prefixBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH;
prefixBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0); prefixBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0);
prefixBlock.compression = CompressionType.Lzma; prefixBlock.compression = CompressionType.Lzma;
lzmaBlockStream = null; lzmaBlockStream = null;
}
structurePointer = Marshal.AllocHGlobal(Marshal.SizeOf(prefixBlock)); structurePointer = Marshal.AllocHGlobal(Marshal.SizeOf(prefixBlock));
structureBytes = new byte[Marshal.SizeOf(prefixBlock)]; structureBytes = new byte[Marshal.SizeOf(prefixBlock)];
@@ -3726,21 +3751,34 @@ namespace DiscImageChef.DiscImages
identifier = BlockType.DataBlock, identifier = BlockType.DataBlock,
type = DataType.CdSectorSubchannel, type = DataType.CdSectorSubchannel,
length = (uint)sectorSubchannel.Length, length = (uint)sectorSubchannel.Length,
crc64 = BitConverter.ToUInt64(blockCrc, 0) crc64 = BitConverter.ToUInt64(blockCrc, 0),
sectorSize = 96
}; };
blockStream = new MemoryStream(); byte[] lzmaProperties = null;
lzmaBlockStream = new LzmaStream(lzmaEncoderProperties, false, blockStream);
lzmaBlockStream.Write(sectorSubchannel, 0, sectorSubchannel.Length);
byte[] lzmaProperties = lzmaBlockStream.Properties;
lzmaBlockStream.Close();
Crc64Context.Data(blockStream.ToArray(), out blockCrc); if(nocompress)
subchannelBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH; {
subchannelBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0); subchannelBlock.compression = CompressionType.None;
subchannelBlock.compression = CompressionType.Lzma; subchannelBlock.cmpCrc64 = subchannelBlock.crc64;
subchannelBlock.cmpLength = subchannelBlock.length;
blockStream = new MemoryStream(sectorSubchannel);
}
else
{
blockStream = new MemoryStream();
lzmaBlockStream = new LzmaStream(lzmaEncoderProperties, false, blockStream);
lzmaBlockStream.Write(sectorSubchannel, 0, sectorSubchannel.Length);
lzmaProperties = lzmaBlockStream.Properties;
lzmaBlockStream.Close();
lzmaBlockStream = null; Crc64Context.Data(blockStream.ToArray(), out blockCrc);
subchannelBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH;
subchannelBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0);
subchannelBlock.compression = CompressionType.Lzma;
lzmaBlockStream = null;
}
structurePointer = Marshal.AllocHGlobal(Marshal.SizeOf(subchannelBlock)); structurePointer = Marshal.AllocHGlobal(Marshal.SizeOf(subchannelBlock));
structureBytes = new byte[Marshal.SizeOf(subchannelBlock)]; structureBytes = new byte[Marshal.SizeOf(subchannelBlock)];
@@ -3873,18 +3911,46 @@ namespace DiscImageChef.DiscImages
crc64 = BitConverter.ToUInt64(blockCrc, 0) crc64 = BitConverter.ToUInt64(blockCrc, 0)
}; };
blockStream = new MemoryStream(); switch(imageInfo.MediaType)
lzmaBlockStream = new LzmaStream(lzmaEncoderProperties, false, blockStream); {
lzmaBlockStream.Write(sectorSubchannel, 0, sectorSubchannel.Length); case MediaType.AppleSonySS:
byte[] lzmaProperties = lzmaBlockStream.Properties; case MediaType.AppleSonyDS:
lzmaBlockStream.Close(); subchannelBlock.sectorSize = 12;
break;
case MediaType.AppleFileWare:
case MediaType.AppleProfile:
case MediaType.AppleWidget:
subchannelBlock.sectorSize = 20;
break;
case MediaType.PriamDataTower:
subchannelBlock.sectorSize = 24;
break;
}
Crc64Context.Data(blockStream.ToArray(), out blockCrc); byte[] lzmaProperties = null;
subchannelBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH;
subchannelBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0); if(nocompress)
subchannelBlock.compression = CompressionType.Lzma; {
subchannelBlock.compression = CompressionType.None;
subchannelBlock.cmpCrc64 = subchannelBlock.crc64;
subchannelBlock.cmpLength = subchannelBlock.length;
blockStream = new MemoryStream(sectorSubchannel);
}
else
{
blockStream = new MemoryStream();
lzmaBlockStream = new LzmaStream(lzmaEncoderProperties, false, blockStream);
lzmaBlockStream.Write(sectorSubchannel, 0, sectorSubchannel.Length);
lzmaProperties = lzmaBlockStream.Properties;
lzmaBlockStream.Close();
lzmaBlockStream = null; Crc64Context.Data(blockStream.ToArray(), out blockCrc);
subchannelBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH;
subchannelBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0);
subchannelBlock.compression = CompressionType.Lzma;
lzmaBlockStream = null;
}
structurePointer = Marshal.AllocHGlobal(Marshal.SizeOf(subchannelBlock)); structurePointer = Marshal.AllocHGlobal(Marshal.SizeOf(subchannelBlock));
structureBytes = new byte[Marshal.SizeOf(subchannelBlock)]; structureBytes = new byte[Marshal.SizeOf(subchannelBlock)];