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

Always use raw subchannel internally.

Browse Source
This commit is contained in:
Natalia Portillo
2020-05-05 15:46:32 +01:00
parent 9506e0fdcc
commit de890b3461
8 changed files with 71 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
View File

@@ -385,9 +385,13 @@ namespace Aaru.Core.Devices.Dumping
_outputPlugin.WriteSectorsLong(data, i + r, 1);
// TODO: Convert Q16 to RAW
if(desiredSubchannel != MmcSubchannel.None)
{
if(supportedSubchannel == MmcSubchannel.Q16)
sub = Subchannel.ConvertQToRaw(sub);
_outputPlugin.WriteSectorsTag(sub, i + r, 1, SectorTagType.CdSectorSubchannel);
}
subLog?.WriteEntry(sub, supportedSubchannel == MmcSubchannel.Raw, (long)(i + r), 1);
}
@@ -502,9 +506,13 @@ namespace Aaru.Core.Devices.Dumping
_outputPlugin.WriteSectorsLong(data, i, blocksToRead);
// TODO: Convert Q16 to RAW
if(desiredSubchannel != MmcSubchannel.None)
{
if(supportedSubchannel == MmcSubchannel.Q16)
sub = Subchannel.ConvertQToRaw(sub);
_outputPlugin.WriteSectorsTag(sub, i, blocksToRead, SectorTagType.CdSectorSubchannel);
}
subLog?.WriteEntry(sub, supportedSubchannel == MmcSubchannel.Raw, (long)i, blocksToRead);
}

4
Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
View File

@@ -755,7 +755,9 @@ namespace Aaru.Core.Devices.Dumping
tmpBuf = new byte[subSize];
Array.Copy(cmdBuf, sectorSize, tmpBuf, 0, subSize);
// TODO: Convert Q16 to RAW
if(supportedSubchannel == MmcSubchannel.Q16)
tmpBuf = Subchannel.ConvertQToRaw(tmpBuf);
ret = _outputPlugin.WriteSectorTag(tmpBuf, 0, SectorTagType.CdSectorSubchannel);
if(!ret)

13
Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
View File

@@ -37,6 +37,7 @@ using Aaru.CommonTypes.Extents;
using Aaru.CommonTypes.Structs.Devices.SCSI;
using Aaru.Console;
using Aaru.Core.Logging;
using Aaru.Decoders.CD;
using Aaru.Decoders.SCSI;
using Aaru.Devices;
using Schemas;
@@ -280,9 +281,13 @@ namespace Aaru.Core.Devices.Dumping
Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
_outputPlugin.WriteSectorLong(data, badSector);
// TODO: Convert Q16 to RAW
if(desiredSubchannel != MmcSubchannel.None)
{
if(supportedSubchannel == MmcSubchannel.Q16)
sub = Subchannel.ConvertQToRaw(sub);
_outputPlugin.WriteSectorTag(sub, badSector, SectorTagType.CdSectorSubchannel);
}
subLog?.WriteEntry(sub, supportedSubchannel == MmcSubchannel.Raw, (long)badSector, 1);
}
@@ -382,9 +387,13 @@ namespace Aaru.Core.Devices.Dumping
Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
_outputPlugin.WriteSectorLong(data, badSector);
// TODO: Convert Q16 to RAW
if(desiredSubchannel != MmcSubchannel.None)
{
if(supportedSubchannel == MmcSubchannel.Q16)
sub = Subchannel.ConvertQToRaw(sub);
_outputPlugin.WriteSectorTag(sub, badSector, SectorTagType.CdSectorSubchannel);
}
subLog?.WriteEntry(sub, supportedSubchannel == MmcSubchannel.Raw, (long)badSector, 1);
}

7
Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs
View File

@@ -34,6 +34,7 @@ using System;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Extents;
using Aaru.Core.Logging;
using Aaru.Decoders.CD;
using Aaru.Devices;
using Schemas;
@@ -307,10 +308,14 @@ namespace Aaru.Core.Devices.Dumping
_outputPlugin.WriteSectorsLong(data, i, _maximumReadable);
// TODO: Convert Q16 to RAW
if(desiredSubchannel != MmcSubchannel.None)
{
if(supportedSubchannel == MmcSubchannel.Q16)
sub = Subchannel.ConvertQToRaw(sub);
_outputPlugin.WriteSectorsTag(sub, i, _maximumReadable,
SectorTagType.CdSectorSubchannel);
}
subLog?.WriteEntry(sub, supportedSubchannel == MmcSubchannel.Raw, (long)i,
_maximumReadable);

7
Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs
View File

@@ -34,6 +34,7 @@ using System;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Extents;
using Aaru.Core.Logging;
using Aaru.Decoders.CD;
using Aaru.Devices;
using Schemas;
@@ -179,9 +180,13 @@ namespace Aaru.Core.Devices.Dumping
Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
_outputPlugin.WriteSectorLong(data, badSector);
// TODO: Convert Q16 to RAW
if(desiredSubchannel != MmcSubchannel.None)
{
if(supportedSubchannel == MmcSubchannel.Q16)
sub = Subchannel.ConvertQToRaw(sub);
_outputPlugin.WriteSectorTag(sub, badSector, SectorTagType.CdSectorSubchannel);
}
subLog?.WriteEntry(sub, supportedSubchannel == MmcSubchannel.Raw, (long)badSector, 1);
}

2
Aaru.Decoders

Submodule Aaru.Decoders updated: f6dd21062d...586c7e4376

4
Aaru.Images/BlindWrite5/Read.cs
View File

@@ -1670,6 +1670,10 @@ namespace Aaru.DiscImages
Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
}
if(tag == SectorTagType.CdSectorSubchannel &&
chars.Subchannel == TrackSubchannelType.Q16Interleaved)
return Subchannel.ConvertQToRaw(buffer);
return buffer;
}

41
Aaru.Images/DiscJuggler/Read.cs
View File

@@ -535,8 +535,7 @@ namespace Aaru.DiscImages
var partition = new Partition
{
Description = track.TrackDescription, Size = (ulong)(trackLen * track.TrackBytesPerSector),
Length = trackLen, Sequence = track.TrackSequence,
Offset = track.TrackFileOffset,
Length = trackLen, Sequence = track.TrackSequence, Offset = track.TrackFileOffset,
Start = track.TrackStartSector, Type = track.TrackType.ToString()
};
@@ -707,8 +706,7 @@ namespace Aaru.DiscImages
{
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");
@@ -720,8 +718,7 @@ namespace Aaru.DiscImages
Where(kvp => sectorAddress >= kvp.Value).
Where(kvp => Tracks.
Where(track => track.TrackSequence == kvp.Key).
Any(track => sectorAddress <
track.TrackEndSector)))
Any(track => sectorAddress < track.TrackEndSector)))
return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag);
throw new ArgumentOutOfRangeException(nameof(sectorAddress), $"Sector address {sectorAddress} not found");
@@ -959,11 +956,17 @@ namespace Aaru.DiscImages
throw new ArgumentException("Unsupported tag requested for this track",
nameof(tag));
case TrackSubchannelType.Q16Interleaved:
throw new ArgumentException("Q16 subchannel not yet supported");
sectorSize = 16;
break;
default:
sectorSize = 96;
break;
}
sectorOffset = 2352;
sectorSize = 96;
sectorSkip = 0;
break;
@@ -1007,11 +1010,16 @@ namespace Aaru.DiscImages
throw new ArgumentException("Unsupported tag requested for this track",
nameof(tag));
case TrackSubchannelType.Q16Interleaved:
throw new ArgumentException("Q16 subchannel not yet supported");
sectorSize = 16;
break;
default:
sectorSize = 96;
break;
}
sectorOffset = 2352;
sectorSize = 96;
sectorSkip = 0;
break;
@@ -1031,11 +1039,16 @@ namespace Aaru.DiscImages
throw new ArgumentException("Unsupported tag requested for this track",
nameof(tag));
case TrackSubchannelType.Q16Interleaved:
throw new ArgumentException("Q16 subchannel not yet supported");
sectorSize = 16;
break;
default:
sectorSize = 96;
break;
}
sectorOffset = 2352;
sectorSize = 96;
sectorSkip = 0;
break;
@@ -1083,6 +1096,10 @@ namespace Aaru.DiscImages
Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
}
if(aaruTrack.TrackSubchannelType == TrackSubchannelType.Q16Interleaved &&
tag == SectorTagType.CdSectorSubchannel)
return Subchannel.ConvertQToRaw(buffer);
return buffer;
}