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

Add mode2 sector reconstruction in dicformat.

Browse Source
This commit is contained in:
Natalia Portillo
2018-08-04 12:56:21 +01:00
parent 9da6253825
commit cee9e53156
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1327,9 +1327,9 @@ namespace DiscImageChef.DiscImages
Array.Copy(sectorPrefix, (int)sectorAddress * 16, sector, 0, 16); Array.Copy(sectorPrefix, (int)sectorAddress * 16, sector, 0, 16);
else if(sectorPrefixDdt != null) else if(sectorPrefixDdt != null)
{ {
if((sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (ulong)CdFixFlags.Correct) if((sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.Correct)
ReconstructPrefix(ref sector, trk.TrackType, (long)sectorAddress); ReconstructPrefix(ref sector, trk.TrackType, (long)sectorAddress);
else if((sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (ulong)CdFixFlags.NotDumped) else if((sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.NotDumped)
{ {
// Do nothing // Do nothing
} }
@@ -1346,9 +1346,9 @@ namespace DiscImageChef.DiscImages
Array.Copy(sectorSuffix, (int)sectorAddress * 288, sector, 2064, 288); Array.Copy(sectorSuffix, (int)sectorAddress * 288, sector, 2064, 288);
else if(sectorSuffixDdt != null) else if(sectorSuffixDdt != null)
{ {
if((sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) == (ulong)CdFixFlags.Correct) if((sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.Correct)
ReconstructEcc(ref sector, trk.TrackType); ReconstructEcc(ref sector, trk.TrackType);
else if((sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) == (ulong)CdFixFlags.NotDumped) else if((sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.NotDumped)
{ {
// Do nothing // Do nothing
} }
@@ -1365,21 +1365,13 @@ 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);
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)
{ {
if((sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (ulong)CdFixFlags.Correct) if((sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.Correct)
ReconstructPrefix(ref sector, trk.TrackType, (long)sectorAddress); ReconstructPrefix(ref sector, trk.TrackType, (long)sectorAddress);
else if((sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (ulong)CdFixFlags.NotDumped) else if((sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.NotDumped)
{ {
// Do nothing // Do nothing
} }
@@ -1392,6 +1384,32 @@ namespace DiscImageChef.DiscImages
} }
else throw new InvalidProgramException("Should not have arrived here"); else throw new InvalidProgramException("Should not have arrived here");
if(mode2Subheaders != null && sectorSuffixDdt != null)
{
Array.Copy(mode2Subheaders, (int)sectorAddress * 8, sector, 16, 8);
if((sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.Mode2Form1Ok)
{
Array.Copy(data, 0, sector, 24, 2048);
ReconstructEcc(ref sector, TrackType.CdMode2Form1);
}
else if((sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) ==
(uint)CdFixFlags.Mode2Form2Ok ||
(sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) ==
(uint)CdFixFlags.Mode2Form2NoCrc)
{
Array.Copy(data, 0, sector, 24, 2324);
if((sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.Mode2Form2Ok)
ReconstructEcc(ref sector, TrackType.CdMode2Form2);
}
}
else 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);
return sector; return sector;
} }