aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-07-08 18:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework all CD ECC code, should correct more errors now.

Browse Source
This commit is contained in:
Natalia Portillo
2026-07-06 00:00:34 +01:00
parent 9411af886b
commit 2f91305c87
2 changed files with 906 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

940
Aaru.Checksums/CDChecksums.cs
View File

File diff suppressed because it is too large Load Diff

55
Aaru.Tests/Checksums/CdChecksumsFix.cs
View File

@@ -27,6 +27,7 @@
// ****************************************************************************/ // ****************************************************************************/
using System; using System;
using System.IO;
using Aaru.Checksums; using Aaru.Checksums;
using FluentAssertions; using FluentAssertions;
using NUnit.Framework; using NUnit.Framework;
@@ -420,6 +421,46 @@ public class CdChecksumsFix
CdChecksums.CheckCdSector(sector).Should().BeFalse(); CdChecksums.CheckCdSector(sector).Should().BeFalse();
} }
[Test]
public void Mode1TwoBytesInSamePRowCanBeFixed()
{
RequirePreparedSector(Mode1Sector, nameof(Mode1Sector));
var sector = new byte[2352];
Array.Copy(Mode1Sector, sector, sector.Length);
CorruptOffsets(sector, 0x62, 0xB8);
CdChecksums.CheckCdSector(sector).Should().BeFalse();
SectorFixResult result = CdChecksums.FixSector(sector);
result.Should().Be(SectorFixResult.Fixed);
CdChecksums.CheckCdSector(sector).Should().BeTrue();
sector.Should().BeEquivalentTo(Mode1Sector);
}
[Test]
public void FailingSectorCanBeFixedWithC2Pointers()
{
string failingPath = Path.Combine(Consts.TestFilesRoot, "Checksum test files", "failingsector.bin");
string workingPath = Path.Combine(Consts.TestFilesRoot, "Checksum test files", "workingsector.bin");
if(!File.Exists(failingPath) || !File.Exists(workingPath))
Assert.Ignore("External sector fixtures are not present.");
byte[] sector = File.ReadAllBytes(failingPath);
byte[] working = File.ReadAllBytes(workingPath);
byte[] c2Pointers = BuildC2PointersFromDifferences(sector, working);
CdChecksums.CheckCdSector(sector).Should().BeFalse();
SectorFixResult result = CdChecksums.FixSector(sector, c2Pointers);
result.Should().Be(SectorFixResult.Fixed);
CdChecksums.CheckCdSector(sector).Should().BeTrue();
sector.Should().BeEquivalentTo(working);
}
[Test] [Test]
public void Mode2Form1HeavyCorruptionCanStillBeFixed() public void Mode2Form1HeavyCorruptionCanStillBeFixed()
{ {
@@ -460,6 +501,20 @@ public class CdChecksumsFix
for(var i = 0; i < offsets.Length; i++) sector[offsets[i]] ^= (byte)(0x11 << (i & 3)); for(var i = 0; i < offsets.Length; i++) sector[offsets[i]] ^= (byte)(0x11 << (i & 3));
} }
static byte[] BuildC2PointersFromDifferences(byte[] sector, byte[] fixedSector)
{
var c2Pointers = new byte[294];
for(var i = 0; i < sector.Length; i++)
{
if(sector[i] == fixedSector[i]) continue;
c2Pointers[i / 8] |= (byte)(0x80 >> (i & 7));
}
return c2Pointers;
}
static void RequirePreparedSector(byte[] sector, string name) static void RequirePreparedSector(byte[] sector, string name)
{ {
if(CdChecksums.CheckCdSector(sector) == true) return; if(CdChecksums.CheckCdSector(sector) == true) return;