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

Reverse offset shift fix.

Browse Source
This commit is contained in:
Natalia Portillo
2019-12-31 17:52:09 +00:00
parent bff9cbac34
commit 6e22116fb0
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
View File

@@ -1470,15 +1470,18 @@ namespace DiscImageChef.Core.Devices.Dumping
{ {
if(offsetFound) if(offsetFound)
{ {
_dumpLog.WriteLine($"Disc offsets is {offsetBytes - (cdOffset.Offset * 4 * -1)}"); _dumpLog.
UpdateStatus?.Invoke($"Disc offsets is {offsetBytes - (cdOffset.Offset * 4 * -1)}"); WriteLine($"Disc offsets is {offsetBytes - (cdOffset.Offset * 4)} bytes ({(offsetBytes / 4) - cdOffset.Offset} samples)");
UpdateStatus?.
Invoke($"Disc offsets is {offsetBytes - (cdOffset.Offset * 4)} bytes ({(offsetBytes / 4) - cdOffset.Offset} samples)");
} }
else else
{ {
_dumpLog.WriteLine("Disc write offset is unknown, dump may not be correct."); _dumpLog.WriteLine("Disc write offset is unknown, dump may not be correct.");
UpdateStatus?.Invoke("Disc write offset is unknown, dump may not be correct."); UpdateStatus?.Invoke("Disc write offset is unknown, dump may not be correct.");
offsetBytes = cdOffset.Offset * 4 * -1; offsetBytes = cdOffset.Offset * 4;
} }
_dumpLog.WriteLine($"Offset is {offsetBytes} bytes."); _dumpLog.WriteLine($"Offset is {offsetBytes} bytes.");
@@ -1625,7 +1628,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(_fixOffset && !inData) if(_fixOffset && !inData)
{ {
// TODO: FreeBSD bug // TODO: FreeBSD bug
if(offsetBytes > 0) if(offsetBytes < 0)
{ {
if(i == 0) if(i == 0)
firstSectorToRead = uint.MaxValue - (uint)(sectorsForOffset - 1); // -1 firstSectorToRead = uint.MaxValue - (uint)(sectorsForOffset - 1); // -1
@@ -1686,8 +1689,8 @@ namespace DiscImageChef.Core.Devices.Dumping
!inData && !inData &&
offsetBytes != 0) offsetBytes != 0)
{ {
int offsetFix = offsetBytes > 0 ? offsetFix = (int)(sectorSize - offsetBytes) int offsetFix = offsetBytes < 0 ? offsetFix = (int)(sectorSize - (offsetBytes * -1))
: offsetFix = offsetBytes * -1; : offsetFix = offsetBytes;
if(supportedSubchannel != MmcSubchannel.None) if(supportedSubchannel != MmcSubchannel.None)
{ {
@@ -2044,8 +2047,8 @@ namespace DiscImageChef.Core.Devices.Dumping
audioExtents.Contains(badSector) && audioExtents.Contains(badSector) &&
offsetBytes != 0) offsetBytes != 0)
{ {
int offsetFix = offsetBytes > 0 ? offsetFix = (int)(sectorSize - offsetBytes) int offsetFix = offsetBytes < 0 ? offsetFix = (int)(sectorSize - (offsetBytes * -1))
: offsetFix = offsetBytes * -1; : offsetFix = offsetBytes;
if(supportedSubchannel != MmcSubchannel.None) if(supportedSubchannel != MmcSubchannel.None)
{ {
@@ -2287,8 +2290,8 @@ namespace DiscImageChef.Core.Devices.Dumping
audioExtents.Contains(badSector) && audioExtents.Contains(badSector) &&
offsetBytes != 0) offsetBytes != 0)
{ {
int offsetFix = offsetBytes > 0 ? offsetFix = (int)(sectorSize - offsetBytes) int offsetFix = offsetBytes > 0 ? offsetFix = (int)(sectorSize - (offsetBytes * -1))
: offsetFix = offsetBytes * -1; : offsetFix = offsetBytes;
if(supportedSubchannel != MmcSubchannel.None) if(supportedSubchannel != MmcSubchannel.None)
{ {