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

CloneCD stores subchannel deinterleaved. Fixes #349

Browse Source
This commit is contained in:
Natalia Portillo
2020-05-05 17:06:19 +01:00
parent 723cf34f38
commit ee8d0f84ba
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Aaru.Images/CloneCD/Read.cs
View File

@@ -822,10 +822,9 @@ namespace Aaru.DiscImages
public byte[] ReadSectors(ulong sectorAddress, uint length)
{
foreach(KeyValuePair<uint, ulong> kvp in from kvp in offsetmap where sectorAddress >= kvp.Value
foreach(KeyValuePair<uint, ulong> kvp in from kvp in offsetmap where sectorAddress >= kvp.Value
from track in Tracks where track.TrackSequence == kvp.Key
where sectorAddress <=
track.TrackEndSector select kvp)
where sectorAddress <= track.TrackEndSector select kvp)
return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key);
throw new ArgumentOutOfRangeException(nameof(sectorAddress), $"Sector address {sectorAddress} not found");
@@ -833,10 +832,9 @@ namespace Aaru.DiscImages
public byte[] ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag)
{
foreach(KeyValuePair<uint, ulong> kvp in from kvp in offsetmap where sectorAddress >= kvp.Value
foreach(KeyValuePair<uint, ulong> kvp in from kvp in offsetmap where sectorAddress >= kvp.Value
from track in Tracks where track.TrackSequence == kvp.Key
where sectorAddress <=
track.TrackEndSector select kvp)
where sectorAddress <= track.TrackEndSector select kvp)
return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag);
throw new ArgumentOutOfRangeException(nameof(sectorAddress), $"Sector address {sectorAddress} not found");
@@ -984,7 +982,7 @@ namespace Aaru.DiscImages
subStream.Seek((long)(aaruTrack.TrackSubchannelOffset + (sectorAddress * 96)), SeekOrigin.Begin);
subStream.Read(buffer, 0, buffer.Length);
return buffer;
return Subchannel.Interleave(buffer);
default: throw new ArgumentException("Unsupported tag requested", nameof(tag));
}

2
Aaru.Images/CloneCD/Write.cs
View File

@@ -616,7 +616,7 @@ namespace Aaru.DiscImages
subStream.Seek((long)(track.TrackSubchannelOffset + ((sectorAddress - track.TrackStartSector) * 96)),
SeekOrigin.Begin);
subStream.Write(data, 0, data.Length);
subStream.Write(Decoders.CD.Subchannel.Deinterleave(data), 0, data.Length);
return true;
}