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

Fix taking account of session start pregaps when writing Alcohol 120% images. Fixes #623

Browse Source
This commit is contained in:
Natalia Portillo
2021-08-03 02:46:21 +01:00
parent ae9645e3b6
commit df0669b18d
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Aaru.Images/Alcohol120/Write.cs
View File

@@ -395,7 +395,7 @@ namespace Aaru.DiscImages
for(uint i = 0; i < length; i++)
{
_imageStream.
Seek((long)(track.TrackFileOffset + (((i + sectorAddress) - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + subchannelSize))),
Seek((long)(track.TrackFileOffset + ((i + sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + subchannelSize))),
SeekOrigin.Begin);
_imageStream.Write(data, (int)(i * track.TrackRawBytesPerSector), track.TrackRawBytesPerSector);
@@ -463,7 +463,7 @@ namespace Aaru.DiscImages
newTrack.TrackFileOffset = currentDataOffset;
currentDataOffset += (ulong)(newTrack.TrackRawBytesPerSector + subchannelSize) *
((newTrack.TrackEndSector - newTrack.TrackStartSector) + 1);
(newTrack.TrackEndSector - newTrack.TrackStartSector + 1);
_writingTracks.Add(newTrack);
}
@@ -564,13 +564,13 @@ namespace Aaru.DiscImages
{
_alcSessions.Add(1, new Session
{
sessionEnd = (int)((_writingTracks[0].TrackEndSector - _writingTracks[0].TrackStartSector) + 1),
sessionEnd = (int)(_writingTracks[0].TrackEndSector - _writingTracks[0].TrackStartSector + 1),
sessionSequence = 1,
allBlocks = 1,
nonTrackBlocks = 3,
firstTrack = 1,
lastTrack = 1,
trackOffset = 4220
allBlocks = 1,
nonTrackBlocks = 3,
firstTrack = 1,
lastTrack = 1,
trackOffset = 4220
});
footerOffset = 4300;
@@ -583,7 +583,7 @@ namespace Aaru.DiscImages
mode = TrackMode.DVD,
adrCtl = 20,
point = 1,
extraOffset = (uint)((_writingTracks[0].TrackEndSector - _writingTracks[0].TrackStartSector) + 1),
extraOffset = (uint)(_writingTracks[0].TrackEndSector - _writingTracks[0].TrackStartSector + 1),
sectorSize = 2048,
files = 1,
footerOffset = (uint)footerOffset,
@@ -758,11 +758,10 @@ namespace Aaru.DiscImages
alcTrk.extraOffset = (uint)currentExtraOffset;
alcTrk.footerOffset = (uint)footerOffset;
if(track.TrackSequence == firstTrack.TrackSequence &&
track.TrackSequence > 1)
if(track.TrackSequence == firstTrack.TrackSequence)
{
alcTrk.startLba -= 150;
alcTrk.startOffset -= (ulong)(alcTrk.sectorSize * 150);
alcTrk.startLba -= (uint)track.TrackPregap;
alcTrk.startOffset -= alcTrk.sectorSize * track.TrackPregap;
}
// Alcohol seems to set that for all CD tracks
@@ -782,7 +781,7 @@ namespace Aaru.DiscImages
var trkExtra = new TrackExtra
{
sectors = (uint)((track.TrackEndSector - track.TrackStartSector) + 1)
sectors = (uint)(track.TrackEndSector - track.TrackStartSector + 1)
};
if(track.TrackSequence == firstTrack.TrackSequence)
@@ -1133,7 +1132,7 @@ namespace Aaru.DiscImages
for(uint i = 0; i < length; i++)
{
_imageStream.
Seek((long)(track.TrackFileOffset + (((i + sectorAddress) - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96))) + track.TrackRawBytesPerSector,
Seek((long)(track.TrackFileOffset + ((i + sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96))) + track.TrackRawBytesPerSector,
SeekOrigin.Begin);
_imageStream.Write(data, (int)(i * 96), 96);

2
Aaru.Tests/Issues/623.cs
View File

@@ -8,7 +8,7 @@ namespace Aaru.Tests.Issues
{
public class _623 : WritableOpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Pending", "issue623");
public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue623");
public override IMediaImage InputPlugin => new AaruFormat();
public override IWritableImage OutputPlugin => new Alcohol120();
public override string OutputExtension => "mds";