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

Calculate optimal read size.

Browse Source
This commit is contained in:
Natalia Portillo
2019-12-14 21:33:00 +00:00
parent 7837c9b393
commit 06465f10c6
1 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,6 +110,7 @@ namespace DiscImageChef.Core.Devices.Dumping
double currentSpeed = 0; double currentSpeed = 0;
double maxSpeed = double.MinValue; double maxSpeed = double.MinValue;
double minSpeed = double.MaxValue; double minSpeed = double.MaxValue;
uint blocksToRead = 64;
Dictionary<MediaTagType, byte[]> mediaTags = new Dictionary<MediaTagType, byte[]>(); // Media tags Dictionary<MediaTagType, byte[]> mediaTags = new Dictionary<MediaTagType, byte[]>(); // Media tags
@@ -1068,49 +1069,6 @@ namespace DiscImageChef.Core.Devices.Dumping
firstTrackPregapMs.Close(); firstTrackPregapMs.Close();
} }
}
/// <summary>Dumps a compact disc</summary>
/// <param name="dskType">Disc type as detected in MMC layer</param>
internal void CompactDiscOld(ref MediaType dskType)
{
ulong blocks = 0;
Track[] tracks = new Track[0];
List<Track> trackList = new List<Track>();
long lastSector = 0;
Dictionary<byte, byte> trackFlags = new Dictionary<byte, byte>();
TrackType firstTrackType = TrackType.Audio;
Dictionary<int, long> leadOutStarts = new Dictionary<int, long>();
uint subSize = 0;
const uint SECTOR_SIZE = 2352;
uint blockSize = SECTOR_SIZE + subSize;
DateTime start;
DateTime end;
bool readcd = false;
bool read6 = false, read10 = false, read12 = false, read16 = false;
bool sense = false;
FullTOC.CDFullTOC? toc = null;
double totalDuration = 0;
double currentSpeed = 0;
double maxSpeed = double.MinValue;
double minSpeed = double.MaxValue;
uint blocksToRead = 64;
Dictionary<MediaTagType, byte[]> mediaTags = new Dictionary<MediaTagType, byte[]>();
byte[] cmdBuf = null;
byte[] senseBuf = null;
byte[] tmpBuf;
MmcSubchannel supportedSubchannel = MmcSubchannel.Raw;
TrackSubchannelType subType = TrackSubchannelType.None; // Track subchannel type
bool supportsLongSectors = true;
int sessions = 1;
int firstTrackLastSession = 0;
DumpHardwareType currentTry = null;
ExtentsULong extents = null;
DateTime timeSpeedStart = DateTime.UtcNow;
ulong sectorSpeedStart = 0;
// Try how many blocks are readable at once // Try how many blocks are readable at once
while(true) while(true)
@@ -1165,9 +1123,50 @@ namespace DiscImageChef.Core.Devices.Dumping
{ {
dumpLog.WriteLine("Device error {0} trying to guess ideal transfer length.", dev.LastError); dumpLog.WriteLine("Device error {0} trying to guess ideal transfer length.", dev.LastError);
StoppingErrorMessage?.Invoke($"Device error {dev.LastError} trying to guess ideal transfer length."); StoppingErrorMessage?.Invoke($"Device error {dev.LastError} trying to guess ideal transfer length.");
return;
} }
}
/// <summary>Dumps a compact disc</summary>
/// <param name="dskType">Disc type as detected in MMC layer</param>
internal void CompactDiscOld(ref MediaType dskType)
{
ulong blocks = 0;
Track[] tracks = new Track[0];
List<Track> trackList = new List<Track>();
long lastSector = 0;
Dictionary<byte, byte> trackFlags = new Dictionary<byte, byte>();
TrackType firstTrackType = TrackType.Audio;
Dictionary<int, long> leadOutStarts = new Dictionary<int, long>();
uint subSize = 0;
const uint SECTOR_SIZE = 2352;
uint blockSize = SECTOR_SIZE + subSize;
DateTime start;
DateTime end;
bool readcd = false;
bool read6 = false, read10 = false, read12 = false, read16 = false;
bool sense = false;
FullTOC.CDFullTOC? toc = null;
double totalDuration = 0;
double currentSpeed = 0;
double maxSpeed = double.MinValue;
double minSpeed = double.MaxValue;
uint blocksToRead = 64;
Dictionary<MediaTagType, byte[]> mediaTags = new Dictionary<MediaTagType, byte[]>();
byte[] cmdBuf = null;
byte[] senseBuf = null;
byte[] tmpBuf;
MmcSubchannel supportedSubchannel = MmcSubchannel.Raw;
TrackSubchannelType subType = TrackSubchannelType.None; // Track subchannel type
bool supportsLongSectors = true;
int sessions = 1;
int firstTrackLastSession = 0;
DumpHardwareType currentTry = null;
ExtentsULong extents = null;
DateTime timeSpeedStart = DateTime.UtcNow;
ulong sectorSpeedStart = 0;
dumpLog.WriteLine("Reading {0} sectors at a time.", blocksToRead); dumpLog.WriteLine("Reading {0} sectors at a time.", blocksToRead);
dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize); dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize);