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

Continue calculation of pregap even if we didnt get a valid Q subchannel.

Browse Source
This commit is contained in:
Natalia Portillo
2020-01-05 15:49:01 +00:00
parent 72578b7daf
commit fb0281ef41
1 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
DiscImageChef.Core/Devices/Dumping/CompactDisc/Pregap.cs
View File

@@ -218,8 +218,6 @@ namespace DiscImageChef.Core.Devices.Dumping
// Calculate pregap // Calculate pregap
lba = (int)track.TrackStartSector - 150; lba = (int)track.TrackStartSector - 150;
pregapFound = false;
while(lba > (int)previousTrack.TrackStartSector) while(lba > (int)previousTrack.TrackStartSector)
{ {
// Some drives crash if you try to read just before the previous read, so seek away first // Some drives crash if you try to read just before the previous read, so seek away first
@@ -237,78 +235,71 @@ namespace DiscImageChef.Core.Devices.Dumping
CRC16CCITTContext.Data(subBuf, 10, out crc); CRC16CCITTContext.Data(subBuf, 10, out crc);
if(crc[0] != subBuf[10] || if(crc[0] == subBuf[10] &&
crc[1] != subBuf[11]) crc[1] == subBuf[11])
continue;
BcdToBinaryQ(subBuf);
// If it's not Q position
if((subBuf[0] & 0xF) != 1)
{
// This means we already searched back, so search forward
if(goFront)
{
lba++;
if(lba == (int)previousTrack.TrackStartSector)
pregapFound = true;
break;
}
// Search back
goneBack = true;
lba--;
break; break;
} }
// Previous track if(retries == 10)
if(subBuf[1] < track.TrackSequence) {
dumpLog?.WriteLine($"Could not get correct subchannel for sector {lba}");
updateStatus?.Invoke($"Could not get correct subchannel for sector {lba}");
}
BcdToBinaryQ(subBuf);
// If it's not Q position
if((subBuf[0] & 0xF) != 1)
{
// This means we already searched back, so search forward
if(goFront)
{ {
lba++; lba++;
// Already gone back, so go forward if(lba == (int)previousTrack.TrackStartSector)
if(goneBack) break;
goFront = true;
break; continue;
} }
// Same track, but not pregap // Search back
if(subBuf[1] == track.TrackSequence && goneBack = true;
subBuf[2] > 0)
{
lba--;
break;
}
// Pregap according to Q position
int pregapQ = (subBuf[3] * 60 * 75) + (subBuf[4] * 75) + subBuf[5] + 1;
// Bigger than known change, otherwise we found it
if(pregapQ > pregaps[track.TrackSequence])
pregaps[track.TrackSequence] = pregapQ;
else if(pregapQ == pregaps[track.TrackSequence])
pregapFound = true;
lba--; lba--;
break; continue;
} }
if(pregapFound) // Previous track
if(subBuf[1] < track.TrackSequence)
{
lba++;
// Already gone back, so go forward
if(goneBack)
goFront = true;
continue;
}
// Same track, but not pregap
if(subBuf[1] == track.TrackSequence &&
subBuf[2] > 0)
{
lba--;
continue;
}
// Pregap according to Q position
int pregapQ = (subBuf[3] * 60 * 75) + (subBuf[4] * 75) + subBuf[5] + 1;
// Bigger than known change, otherwise we found it
if(pregapQ > pregaps[track.TrackSequence])
pregaps[track.TrackSequence] = pregapQ;
else if(pregapQ == pregaps[track.TrackSequence])
break; break;
if(retries != 10) lba--;
continue;
dumpLog?.WriteLine($"Could not calculate pregap for track {track.TrackSequence}");
updateStatus?.Invoke($"Could not calculate pregap for track {track.TrackSequence}");
break;
} }
} }