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

Return empty data in BlindWrite 5 images where only some tracks has subchannel. Fixes #485

Browse Source
This commit is contained in:
Natalia Portillo
2021-06-30 20:27:51 +01:00
parent 9e7ec8d178
commit 98b0785bde
3 changed files with 141 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -996,9 +996,8 @@ namespace Aaru.DiscImages
track.TrackSubchannelType = splitStartChars.Subchannel;
track.TrackSubchannelOffset = track.TrackFileOffset;
if(splitStartChars.Subchannel == TrackSubchannelType.PackedInterleaved)
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
}
splitStartChars.FileFilter = splitStream.Filter;
@@ -1028,9 +1027,8 @@ namespace Aaru.DiscImages
track.TrackSubchannelType = chars.Subchannel;
track.TrackSubchannelOffset = track.TrackFileOffset;
if(chars.Subchannel == TrackSubchannelType.PackedInterleaved)
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
}
break;
@@ -1745,7 +1743,40 @@ namespace Aaru.DiscImages
break;
}
case SectorTagType.CdSectorSubchannel:
throw new NotImplementedException("Packed subchannel not yet supported");
{
switch(chars.Subchannel)
{
case TrackSubchannelType.PackedInterleaved:
{
sectorOffset = 2352;
sectorSize = 96;
sectorSkip = 0;
break;
}
case TrackSubchannelType.Q16Interleaved:
{
sectorOffset = 2352;
sectorSize = 16;
sectorSkip = 0;
break;
}
case TrackSubchannelType.None:
{
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
throw new
FeatureSupportedButNotImplementedImageException("Unsupported track type");
return new byte[length * 96];
}
default: throw new ArgumentOutOfRangeException();
}
break;
}
default: throw new ArgumentException("Unsupported tag requested", nameof(tag));
}
@@ -1797,6 +1828,14 @@ namespace Aaru.DiscImages
break;
}
case TrackSubchannelType.None:
{
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
throw new
FeatureSupportedButNotImplementedImageException("Unsupported track type");
return new byte[length * 96];
}
default: throw new ArgumentOutOfRangeException();
}
@@ -1888,6 +1927,14 @@ namespace Aaru.DiscImages
break;
}
case TrackSubchannelType.None:
{
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
throw new
FeatureSupportedButNotImplementedImageException("Unsupported track type");
return new byte[length * 96];
}
default: throw new ArgumentOutOfRangeException();
}
@@ -1954,6 +2001,14 @@ namespace Aaru.DiscImages
break;
}
case TrackSubchannelType.None:
{
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
throw new
FeatureSupportedButNotImplementedImageException("Unsupported track type");
return new byte[length * 96];
}
default: throw new ArgumentOutOfRangeException();
}
@@ -1989,7 +2044,14 @@ namespace Aaru.DiscImages
break;
}
case TrackSubchannelType.None:
{
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
throw new
FeatureSupportedButNotImplementedImageException("Unsupported track type");
return new byte[length * 96];
}
default: throw new ArgumentOutOfRangeException();
}