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

Separate mode2 subheader from sector contents, helps for deduplication and compression.

Browse Source
This commit is contained in:
Natalia Portillo
2018-08-02 22:31:02 +01:00
parent 224ef1b249
commit 076297bbbd
5 changed files with 97 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DiscImageChef.DiscImages/DiscImageChef/DiscImageChef.cs
View File

@@ -161,6 +161,7 @@ namespace DiscImageChef.DiscImages
ulong[] userDataDdt; ulong[] userDataDdt;
bool writingLong; bool writingLong;
ulong writtenSectors; ulong writtenSectors;
byte[] mode2Subheaders;
public DiscImageChef() public DiscImageChef()
{ {

4
DiscImageChef.DiscImages/DiscImageChef/Enums.cs
View File

@@ -205,7 +205,9 @@ namespace DiscImageChef.DiscImages
/// <summary>CompactDisc sector prefix (sync, header), only incorrect stored</summary> /// <summary>CompactDisc sector prefix (sync, header), only incorrect stored</summary>
CdSectorPrefixCorrected = 76, CdSectorPrefixCorrected = 76,
/// <summary>CompactDisc sector suffix (edc, ecc p, ecc q), only incorrect stored</summary> /// <summary>CompactDisc sector suffix (edc, ecc p, ecc q), only incorrect stored</summary>
CdSectorSuffixCorrected = 77 CdSectorSuffixCorrected = 77,
/// <summary>CompactDisc MODE 2 subheader</summary>
CompactDiscMode2Subheader = 78
} }
/// <summary>List of known blocks types</summary> /// <summary>List of known blocks types</summary>

10
DiscImageChef.DiscImages/DiscImageChef/Read.cs
View File

@@ -269,6 +269,9 @@ namespace DiscImageChef.DiscImages
if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag)) if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag); imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
break; break;
case DataType.CompactDiscMode2Subheader:
mode2Subheaders = data;
break;
default: default:
MediaTagType mediaTagType = GetMediaTagTypeForDataType(blockHeader.type); MediaTagType mediaTagType = GetMediaTagTypeForDataType(blockHeader.type);
@@ -1362,7 +1365,14 @@ namespace DiscImageChef.DiscImages
case TrackType.CdMode2Formless: case TrackType.CdMode2Formless:
case TrackType.CdMode2Form1: case TrackType.CdMode2Form1:
case TrackType.CdMode2Form2: case TrackType.CdMode2Form2:
if(mode2Subheaders != null)
{
Array.Copy(mode2Subheaders, (int)sectorAddress * 8, sector, 16, 8);
Array.Copy(data, 0, sector, 24, 2328);
}
else
Array.Copy(data, 0, sector, 16, 2336); Array.Copy(data, 0, sector, 16, 2336);
if(sectorPrefix != null) if(sectorPrefix != null)
Array.Copy(sectorPrefix, (int)sectorAddress * 16, sector, 0, 16); Array.Copy(sectorPrefix, (int)sectorAddress * 16, sector, 0, 16);
else if(sectorPrefixMs != null) else if(sectorPrefixMs != null)

85
DiscImageChef.DiscImages/DiscImageChef/Write.cs
View File

@@ -1211,7 +1211,7 @@ namespace DiscImageChef.DiscImages
if(sectorPrefixDdt == null) sectorPrefixDdt = new uint[imageInfo.Sectors]; if(sectorPrefixDdt == null) sectorPrefixDdt = new uint[imageInfo.Sectors];
sector = new byte[2336]; sector = new byte[2328];
if(ArrayHelpers.ArrayIsNullOrEmpty(data)) if(ArrayHelpers.ArrayIsNullOrEmpty(data))
{ {
sectorPrefixDdt[sectorAddress] = (uint)CdFixFlags.NotDumped; sectorPrefixDdt[sectorAddress] = (uint)CdFixFlags.NotDumped;
@@ -1223,9 +1223,7 @@ namespace DiscImageChef.DiscImages
if(data[0x00] != 0x00 || data[0x01] != 0xFF || data[0x02] != 0xFF || data[0x03] != 0xFF || if(data[0x00] != 0x00 || data[0x01] != 0xFF || data[0x02] != 0xFF || data[0x03] != 0xFF ||
data[0x04] != 0xFF || data[0x05] != 0xFF || data[0x06] != 0xFF || data[0x07] != 0xFF || data[0x04] != 0xFF || data[0x05] != 0xFF || data[0x06] != 0xFF || data[0x07] != 0xFF ||
data[0x08] != 0xFF || data[0x09] != 0xFF || data[0x0A] != 0xFF || data[0x0B] != 0x00 || data[0x08] != 0xFF || data[0x09] != 0xFF || data[0x0A] != 0xFF || data[0x0B] != 0x00 ||
data[0x0F] != 0x02 || data[0x10] != 0x00 || data[0x11] != 0x00 || data[0x12] != 0x00 || data[0x0F] != 0x02) prefixCorrect = false;
data[0x13] != 0x00 || data[0x14] != 0x00 || data[0x15] != 0x00 || data[0x16] != 0x00 ||
data[0x17] != 0x00) prefixCorrect = false;
if(prefixCorrect) if(prefixCorrect)
{ {
@@ -1249,7 +1247,10 @@ namespace DiscImageChef.DiscImages
sectorPrefixMs.Write(data, 0, 16); sectorPrefixMs.Write(data, 0, 16);
} }
Array.Copy(data, 16, sector, 0, 2336); if(mode2Subheaders == null) mode2Subheaders = new byte[imageInfo.Sectors * 8];
Array.Copy(data, 16, mode2Subheaders, (int)sectorAddress * 8, 8);
Array.Copy(data, 24, sector, 0, 2328);
return WriteSector(sector, sectorAddress); return WriteSector(sector, sectorAddress);
} }
@@ -2380,6 +2381,80 @@ namespace DiscImageChef.DiscImages
index.Add(idxEntry); index.Add(idxEntry);
} }
if(mode2Subheaders != null)
{
idxEntry = new IndexEntry
{
blockType = BlockType.DataBlock,
dataType = DataType.CompactDiscMode2Subheader,
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("DiscImageChef format plugin",
"Writing CD MODE2 subheaders block to position {0}", idxEntry.offset);
Crc64Context.Data(mode2Subheaders, out byte[] blockCrc);
BlockHeader subheaderBlock = new BlockHeader
{
identifier = BlockType.DataBlock,
type = DataType.CompactDiscMode2Subheader,
length = (uint)mode2Subheaders.Length,
crc64 = BitConverter.ToUInt64(blockCrc, 0),
sectorSize = 8
};
byte[] lzmaProperties = null;
if(nocompress)
{
subheaderBlock.compression = CompressionType.None;
subheaderBlock.cmpCrc64 = subheaderBlock.crc64;
subheaderBlock.cmpLength = subheaderBlock.length;
blockStream = new MemoryStream(mode2Subheaders);
}
else
{
startCompress = DateTime.Now;
blockStream = new MemoryStream();
lzmaBlockStream = new LzmaStream(lzmaEncoderProperties, false, blockStream);
lzmaBlockStream.Write(mode2Subheaders, 0, mode2Subheaders.Length);
lzmaProperties = lzmaBlockStream.Properties;
lzmaBlockStream.Close();
Crc64Context cmpCrc = new Crc64Context();
cmpCrc.Update(lzmaProperties);
cmpCrc.Update(blockStream.ToArray());
blockCrc = cmpCrc.Final();
subheaderBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH;
subheaderBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0);
subheaderBlock.compression = CompressionType.Lzma;
lzmaBlockStream = null;
endCompress = DateTime.Now;
DicConsole.DebugWriteLine("DiscImageChef format plugin",
"Took {0} seconds to compress MODE2 subheaders",
(endCompress - startCompress).TotalSeconds);
}
structurePointer = Marshal.AllocHGlobal(Marshal.SizeOf(subheaderBlock));
structureBytes = new byte[Marshal.SizeOf(subheaderBlock)];
Marshal.StructureToPtr(subheaderBlock, structurePointer, true);
Marshal.Copy(structurePointer, structureBytes, 0, structureBytes.Length);
Marshal.FreeHGlobal(structurePointer);
imageStream.Write(structureBytes, 0, structureBytes.Length);
if(subheaderBlock.compression == CompressionType.Lzma)
imageStream.Write(lzmaProperties, 0, lzmaProperties.Length);
imageStream.Write(blockStream.ToArray(), 0, (int)blockStream.Length);
index.RemoveAll(t => t.blockType == BlockType.DataBlock &&
t.dataType == DataType.CompactDiscMode2Subheader);
index.Add(idxEntry);
blockStream = null;
}
if(sectorSubchannel != null) if(sectorSubchannel != null)
{ {
idxEntry = new IndexEntry idxEntry = new IndexEntry

3
templates/dicformat.bt
View File

@@ -624,7 +624,8 @@ enum <ushort> DataType
PriamDataTowerTag = 74, PriamDataTowerTag = 74,
CompactDiscMediaCatalogueNumber = 75, CompactDiscMediaCatalogueNumber = 75,
CdSectorPrefixCorrected = 76, CdSectorPrefixCorrected = 76,
CdSectorSuffixCorrected = 77 CdSectorSuffixCorrected = 77,
CompactDiscMode2Subheader = 78
}; };
enum <uint> BlockType enum <uint> BlockType