claunia/cuetools.net
1
0
Fork 0
mirror of https://github.com/claunia/cuetools.net.git synced 2025-12-16 18:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

moving AccurateRipId calculations to CUETools.AccurateRip

Browse Source
This commit is contained in:
chudov
2008-11-30 00:03:49 +00:00
parent 34a730b730
commit 5801c9b605
5 changed files with 76 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
CUETools.AccurateRip/AccurateRip.cs
View File

@@ -326,7 +326,7 @@ namespace CUETools.AccurateRip
get { throw new Exception("unsupported"); }
}
public void GenerateAccurateRipLog(TextWriter sw, int oi)
public void GenerateLog(TextWriter sw, int oi)
{
for (int iTrack = 0; iTrack < _toc.AudioTracks; iTrack++)
{
@@ -362,6 +362,47 @@ namespace CUETools.AccurateRip
}
}
public void GenerateFullLog(TextWriter sw, int offsetApplied)
{
if (AccResult == HttpStatusCode.NotFound)
{
sw.WriteLine("Disk not present in database.");
//for (iTrack = 0; iTrack < TrackCount; iTrack++)
// sw.WriteLine(String.Format(" {0:00}\t[{1:x8}] Disk not present in database", iTrack + 1, _tracks[iTrack].CRC));
}
else if (AccResult != HttpStatusCode.OK)
{
sw.WriteLine("Database access error: " + AccResult.ToString());
//for (iTrack = 0; iTrack < TrackCount; iTrack++)
// sw.WriteLine(String.Format(" {0:00}\t[{1:x8}] Database access error {2}", iTrack + 1, _tracks[iTrack].CRC, accResult.ToString()));
}
else
{
sw.WriteLine("Track\t[ CRC ] Status");
GenerateLog(sw, offsetApplied);
uint offsets_match = 0;
for (int oi = -_arOffsetRange; oi <= _arOffsetRange; oi++)
{
uint matches = 0;
for (int iTrack = 0; iTrack < _toc.AudioTracks; iTrack++)
for (int di = 0; di < (int)AccDisks.Count; di++)
if ((CRC(iTrack, oi) == AccDisks[di].tracks[iTrack].CRC && AccDisks[di].tracks[iTrack].CRC != 0) ||
(CRC450(iTrack, oi) == AccDisks[di].tracks[iTrack].Frame450CRC && AccDisks[di].tracks[iTrack].Frame450CRC != 0))
matches++;
if (matches != 0 && oi != offsetApplied)
{
if (offsets_match++ > 10)
{
sw.WriteLine("More than 10 offsets match!");
break;
}
sw.WriteLine("Offsetted by {0}:", oi);
GenerateLog(sw, oi);
}
}
}
}
private static uint sumDigits(uint n)
{
uint r = 0;

11
CUETools.CDImage/CDImage.cs
View File

@@ -224,15 +224,13 @@ namespace CUETools.CDImage
public class CDImageLayout : ICloneable
{
public CDImageLayout(uint length)
public CDImageLayout()
{
_tracks = new List<CDTrack>();
_length = length;
}
public CDImageLayout(CDImageLayout src)
{
_length = src._length;
_catalog = src._catalog;
_audioTracks = src._audioTracks;
_tracks = new List<CDTrack>();
@@ -249,11 +247,7 @@ namespace CUETools.CDImage
{
get
{
return _length;
}
set
{
_length = value;
return TrackCount > 0 ? _tracks[TrackCount - 1].End + 1U : 0U;
}
}
@@ -337,7 +331,6 @@ namespace CUETools.CDImage
return String.Format("{0:00}:{1:00}:{2:00}", min, sec, frame);
}
uint _length;
string _catalog;
IList<CDTrack> _tracks;
uint _audioTracks;

3
CUETools.Ripper.Console/Program.cs
View File

@@ -126,8 +126,7 @@ namespace CUERipper
logWriter.WriteLine();
logWriter.WriteLine("AccurateRip summary");
logWriter.WriteLine();
logWriter.WriteLine("Track\t[ CRC ] Status");
arVerify.GenerateAccurateRipLog(logWriter, 0);
arVerify.GenerateFullLog(logWriter, 0);
logWriter.WriteLine();
logWriter.WriteLine("End of status report");
logWriter.Close();

11
CUETools.Ripper.SCSI/SCSIDrive.cs
View File

@@ -106,10 +106,13 @@ namespace CUETools.Ripper.SCSI
st = m_device.ReadCDText(out cdtext);
// new CDTextEncoderDecoder
_toc = new CDImageLayout(toc[toc.Count - 1].StartSector);
_toc = new CDImageLayout();
for (int iTrack = 0; iTrack < toc.Count - 1; iTrack++)
_toc.AddTrack(new CDTrack((uint)iTrack + 1, toc[iTrack].StartSector,
toc[iTrack + 1].StartSector - toc[iTrack].StartSector, toc[iTrack].Control == 0));
_toc.AddTrack(new CDTrack((uint)iTrack + 1,
toc[iTrack].StartSector,
toc[iTrack + 1].StartSector - toc[iTrack].StartSector -
((toc[iTrack + 1].Control == 0 || iTrack + 1 == toc.Count - 1) ? 0U : 152U * 75U),
toc[iTrack].Control == 0));
return true;
}
@@ -324,7 +327,7 @@ namespace CUETools.Ripper.SCSI
{
if (_toc == null)
throw new Exception("invalid TOC");
return (ulong)588 * (_toc.Length - (_toc[_toc.TrackCount].IsAudio ? 0 : _toc[_toc.TrackCount].Length + 152 * 75));
return (ulong)588 * (_toc[_toc.TrackCount].IsAudio ? _toc[_toc.TrackCount].End + 1 : _toc[_toc.TrackCount - 1].End + 1);
}
}

91
CUEToolsLib/Main.cs
View File

@@ -440,7 +440,7 @@ namespace CUETools.Processor
_progress = new CUEToolsProgressEventArgs();
_attributes = new List<CUELine>();
_tracks = new List<TrackInfo>();
_toc = new CDImageLayout(0);
_toc = new CDImageLayout();
_sources = new List<SourceInfo>();
_sourcePaths = new List<string>();
_albumTags = new NameValueCollection();
@@ -750,13 +750,13 @@ namespace CUETools.Processor
throw new Exception("Indexes must be in chronological order.");
_toc[indexes[i].Track].AddIndex(new CDTrackIndex((uint)indexes[i].Index, (uint)indexes[i].Time, (uint)length));
}
_toc.Length = (uint) indexes[indexes.Count - 1].Time;
// Calculate the length of each track
for (i = 1; i <= TrackCount; i++)
{
if (_toc[i].LastIndex < 1)
throw new Exception("Track must have an INDEX 01.");
_toc[i].Start = _toc[i][1].Start;
_toc[i].Length = (i == TrackCount ? _toc.Length - _toc[i].Start : _toc[i+1][1].Start - _toc[i].Start);
_toc[i].Length = (i == TrackCount ? (uint)indexes[indexes.Count - 1].Time - _toc[i].Start : _toc[i + 1][1].Start - _toc[i].Start);
}
// Store the audio filenames, generating generic names if necessary
@@ -811,33 +811,26 @@ namespace CUETools.Processor
if (_accurateRipId == null && _dataTrackLength == null && _eacLog != null)
{
sr = new StringReader(_eacLog);
int lastAudioSector = -1;
uint lastAudioSector = 0;
bool isEACLog = false;
CDImageLayout tocFromLog = new CDImageLayout();
while ((lineStr = sr.ReadLine()) != null)
{
if (!isEACLog)
if (isEACLog)
{
if (!lineStr.StartsWith("Exact Audio Copy"))
break;
string[] n = lineStr.Split('|');
uint trNo, trStart, trEnd;
if (n.Length == 5 && uint.TryParse(n[0], out trNo) && uint.TryParse(n[3], out trStart) && uint.TryParse(n[4], out trEnd))
tocFromLog.AddTrack(new CDTrack(trNo, trStart, trEnd + 1 - trStart,
tocFromLog.TrackCount < _toc.TrackCount || trStart != tocFromLog[tocFromLog.TrackCount].End + 1U + 152U * 75U));
} else
if (lineStr.StartsWith("TOC of the extracted CD")
|| lineStr.StartsWith("Exact Audio Copy")
|| lineStr.StartsWith("CUERipper"))
isEACLog = true;
}
string[] n = lineStr.Split('|');
if (n.Length == 5)
try
{
int trNo = Int32.Parse(n[0]);
int trStart = Int32.Parse(n[3]);
int trEnd = Int32.Parse(n[4]);
if (trNo == TrackCount && trEnd > 0)
lastAudioSector = trEnd;
if (trNo == TrackCount + 1 && lastAudioSector != -1 && trEnd > lastAudioSector + (90 + 60) * 75 + 150)
{
_dataTrackLength = (uint)(trEnd - lastAudioSector - (90 + 60) * 75 - 150);
break;
}
}
catch { }
}
if (tocFromLog.TrackCount == _toc.TrackCount + 1 && !tocFromLog[tocFromLog.TrackCount].IsAudio)
_accurateRipId = AccurateRipVerify.CalculateAccurateRipId(tocFromLog);
}
CUELine cddbDiscIdLine = General.FindCUELine(_attributes, "REM", "DISCID");
@@ -847,8 +840,7 @@ namespace CUETools.Processor
if (_dataTrackLength != null)
{
CDImageLayout toc2 = new CDImageLayout(_toc);
toc2.AddTrack(new CDTrack((uint)_toc.TrackCount, _toc.Length + 152 * 75, _dataTrackLength.Value, false));
toc2.Length += 152 * 75 + _dataTrackLength.Value;
toc2.AddTrack(new CDTrack((uint)_toc.TrackCount, _toc.Length + 152U * 75U, _dataTrackLength.Value, false));
_accurateRipIdActual = _accurateRipId = AccurateRipVerify.CalculateAccurateRipId(toc2);
}
else
@@ -1318,8 +1310,8 @@ namespace CUETools.Processor
public void GenerateAccurateRipLog(TextWriter sw)
{
int iTrack;
sw.WriteLine (String.Format("[Disc ID: {0}]", _accurateRipId));
sw.WriteLine("[Verification date: {0}]", DateTime.Now);
sw.WriteLine("[Disc ID: {0}]", _accurateRipId);
if (_dataTrackLength.HasValue)
sw.WriteLine("Assuming a data track was present, length {0}.", CDImageLayout.TimeToString(_dataTrackLength.Value));
else
@@ -1349,46 +1341,9 @@ namespace CUETools.Processor
);
}
if (_arVerify.AccResult == HttpStatusCode.NotFound)
{
sw.WriteLine("Disk not present in database.");
//for (iTrack = 0; iTrack < TrackCount; iTrack++)
// sw.WriteLine(String.Format(" {0:00}\t[{1:x8}] Disk not present in database", iTrack + 1, _tracks[iTrack].CRC));
}
else if (_arVerify.AccResult != HttpStatusCode.OK)
{
sw.WriteLine("Database access error: " + _arVerify.AccResult.ToString());
//for (iTrack = 0; iTrack < TrackCount; iTrack++)
// sw.WriteLine(String.Format(" {0:00}\t[{1:x8}] Database access error {2}", iTrack + 1, _tracks[iTrack].CRC, accResult.ToString()));
}
else
{
if (0 != _writeOffset)
sw.WriteLine(String.Format("Offset applied: {0}", _writeOffset));
int offsetApplied = _accurateOffset ? _writeOffset : 0;
sw.WriteLine(String.Format("Track\t[ CRC ] Status"));
_arVerify.GenerateAccurateRipLog(sw, offsetApplied);
uint offsets_match = 0;
for (int oi = -_arOffsetRange; oi <= _arOffsetRange; oi++)
{
uint matches = 0;
for (iTrack = 0; iTrack < TrackCount; iTrack++)
for (int di = 0; di < (int)_arVerify.AccDisks.Count; di++)
if ((_arVerify.CRC(iTrack, oi) == _arVerify.AccDisks[di].tracks[iTrack].CRC && _arVerify.AccDisks[di].tracks[iTrack].CRC != 0) ||
(_arVerify.CRC450(iTrack, oi) == _arVerify.AccDisks[di].tracks[iTrack].Frame450CRC && _arVerify.AccDisks[di].tracks[iTrack].Frame450CRC != 0))
matches++;
if (matches != 0 && oi != offsetApplied)
{
if (offsets_match++ > 10)
{
sw.WriteLine("More than 10 offsets match!");
break;
}
sw.WriteLine(String.Format("Offsetted by {0}:", oi));
_arVerify.GenerateAccurateRipLog(sw, oi);
}
}
}
sw.WriteLine("Offset applied: {0}", _writeOffset);
_arVerify.GenerateFullLog(sw, _accurateOffset ? _writeOffset : 0);
}
public void GenerateAccurateRipTagsForTrack(NameValueCollection tags, int offset, int bestOffset, int iTrack, string prefix)
@@ -1530,7 +1485,6 @@ namespace CUETools.Processor
for (uint dtl = minDTL; dtl < minDTL + 75; dtl++)
{
toc2[_toc.TrackCount].Length = dtl;
toc2.Length = _toc.Length + 152 * 75 + dtl;
_accurateRipId = AccurateRipVerify.CalculateAccurateRipId(toc2);
_arVerify.ContactAccurateRip(_accurateRipId);
if (_arVerify.AccResult != HttpStatusCode.NotFound)
@@ -2329,7 +2283,6 @@ namespace CUETools.Processor
_dataTrackLength = dtl;
CDImageLayout toc2 = new CDImageLayout(_toc);
toc2.AddTrack(new CDTrack((uint)_toc.TrackCount, _toc.Length + 152 * 75, dtl, false));
toc2.Length += 152 * 75 + dtl;
_accurateRipIdActual = _accurateRipId = AccurateRipVerify.CalculateAccurateRipId(toc2);
}
}