aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛Fix dumping PW subchannel, fixes #161

Browse Source
This commit is contained in:
Natalia Portillo
2018-01-25 23:31:27 +00:00
parent 8dc2c5043f
commit 6876375497
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -607,11 +607,11 @@ namespace DiscImageChef.Core.Devices.Dumping
// If a subchannel is supported, check if output plugin allows us to write it. // If a subchannel is supported, check if output plugin allows us to write it.
if(supportedSubchannel != MmcSubchannel.None) if(supportedSubchannel != MmcSubchannel.None)
{ {
sense = dev.ReadCd(out readBuffer, out senseBuf, 0, blockSize, 64, MmcSectorTypes.AllTypes, false, sense = dev.ReadCd(out readBuffer, out senseBuf, 0, blockSize, 1, MmcSectorTypes.AllTypes, false, false,
false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, supportedSubchannel,
supportedSubchannel, dev.Timeout, out _); dev.Timeout, out _);
byte[] tmpBuf = new byte[SECTOR_SIZE]; byte[] tmpBuf = new byte[subSize];
Array.Copy(readBuffer, SECTOR_SIZE, tmpBuf, 0, subSize); Array.Copy(readBuffer, SECTOR_SIZE, tmpBuf, 0, subSize);
ret = outputPlugin.WriteSectorTag(tmpBuf, 0, SectorTagType.CdSectorSubchannel); ret = outputPlugin.WriteSectorTag(tmpBuf, 0, SectorTagType.CdSectorSubchannel);
@@ -700,15 +700,21 @@ namespace DiscImageChef.Core.Devices.Dumping
ibgLog.Write(i, currentSpeed * 1024); ibgLog.Write(i, currentSpeed * 1024);
extents.Add(i, blocksToRead, true); extents.Add(i, blocksToRead, true);
if(supportedSubchannel != MmcSubchannel.None) if(supportedSubchannel != MmcSubchannel.None)
for(int b = 0; b < blocksToRead; b++) {
byte[] data = new byte[SECTOR_SIZE * blocksToRead];
byte[] sub = new byte[subSize * blocksToRead];
for(int b = 0; b < blocksToRead; b++)
{ {
byte[] data = new byte[SECTOR_SIZE]; Array.Copy(readBuffer, (int)(0 + b * blockSize), data, SECTOR_SIZE * b,
byte[] sub = new byte[subSize]; SECTOR_SIZE);
Array.Copy(readBuffer, (int)(0 + b * blockSize), data, 0, SECTOR_SIZE); Array.Copy(readBuffer, (int)(SECTOR_SIZE + b * blockSize), sub, subSize * b,
Array.Copy(readBuffer, (int)(SECTOR_SIZE + b * blockSize), sub, 0, subSize); subSize);
outputPlugin.WriteSectors(data, i, blocksToRead);
outputPlugin.WriteSectorsTag(sub, i, blocksToRead, SectorTagType.CdSectorSubchannel);
} }
outputPlugin.WriteSectors(data, i, blocksToRead);
outputPlugin.WriteSectorsTag(sub, i, blocksToRead, SectorTagType.CdSectorSubchannel);
}
else outputPlugin.WriteSectors(readBuffer, i, blocksToRead); else outputPlugin.WriteSectors(readBuffer, i, blocksToRead);
} }
else else
@@ -776,7 +782,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(readcd) if(readcd)
{ {
sense = dev.ReadCd(out readBuffer, out senseBuf, (uint)badSector, blockSize, blocksToRead, sense = dev.ReadCd(out readBuffer, out senseBuf, (uint)badSector, blockSize, 1,
MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true,
true, MmcErrorField.None, supportedSubchannel, dev.Timeout, true, MmcErrorField.None, supportedSubchannel, dev.Timeout,
out double cmdDuration); out double cmdDuration);
@@ -801,7 +807,7 @@ namespace DiscImageChef.Core.Devices.Dumping
outputPlugin.WriteSector(data, badSector); outputPlugin.WriteSector(data, badSector);
outputPlugin.WriteSectorTag(sub, badSector, SectorTagType.CdSectorSubchannel); outputPlugin.WriteSectorTag(sub, badSector, SectorTagType.CdSectorSubchannel);
} }
else outputPlugin.WriteSectors(readBuffer, badSector, blocksToRead); else outputPlugin.WriteSector(readBuffer, badSector);
} }
if(pass < retryPasses && !aborted && resume.BadBlocks.Count > 0) if(pass < retryPasses && !aborted && resume.BadBlocks.Count > 0)