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

* CTDB verification & submission sped up significantly

Browse Source
This commit is contained in:
chudov
2011-04-17 02:07:13 +00:00
parent c4a5a465ef
commit 153633c991
4 changed files with 113 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
CUETools.AccurateRip/AccurateRip.cs
View File

@@ -89,7 +89,7 @@ namespace CUETools.AccurateRip
return (int)val[0]; return (int)val[0];
} }
public static bool operator == (OffsetSafeCRCRecord x, OffsetSafeCRCRecord y) public static bool operator ==(OffsetSafeCRCRecord x, OffsetSafeCRCRecord y)
{ {
if (x as object == null || y as object == null) return x as object == null && y as object == null; if (x as object == null || y as object == null) return x as object == null && y as object == null;
if (x.Value.Length != y.Value.Length) return false; if (x.Value.Length != y.Value.Length) return false;
@@ -110,7 +110,7 @@ namespace CUETools.AccurateRip
return FindOffset(rec, out offset); return FindOffset(rec, out offset);
} }
public bool FindOffset (OffsetSafeCRCRecord rec, out int offset) public bool FindOffset(OffsetSafeCRCRecord rec, out int offset)
{ {
if (this.Value.Length != 128 || rec.Value.Length != 128) if (this.Value.Length != 128 || rec.Value.Length != 128)
{ {
@@ -243,7 +243,7 @@ namespace CUETools.AccurateRip
public uint DBCRC(int iTrack) public uint DBCRC(int iTrack)
{ {
return ARStatus == null && iTrack +_toc.FirstAudio - 1 < AccDisks[0].tracks.Count return ARStatus == null && iTrack + _toc.FirstAudio - 1 < AccDisks[0].tracks.Count
? AccDisks[0].tracks[iTrack + _toc.FirstAudio - 1].CRC : 0U; ? AccDisks[0].tracks[iTrack + _toc.FirstAudio - 1].CRC : 0U;
} }
@@ -436,6 +436,8 @@ namespace CUETools.AccurateRip
internal ushort[,] syndrome; internal ushort[,] syndrome;
internal byte[] parity; internal byte[] parity;
internal ushort[, ,] encodeTable;
internal ushort[, ,] decodeTable;
private int maxOffset; private int maxOffset;
internal ushort[] leadin; internal ushort[] leadin;
internal ushort[] leadout; internal ushort[] leadout;
@@ -484,7 +486,7 @@ namespace CUETools.AccurateRip
if (oi > 0) if (oi > 0)
{ {
crcA = iTrack > 1 ? crcA = iTrack > 1 ?
_CRC32[iTrack, oi]: _CRC32[iTrack, oi] :
_CRC32[iTrack, prefixSamples]; _CRC32[iTrack, prefixSamples];
crcB = iTrack < _toc.AudioTracks ? crcB = iTrack < _toc.AudioTracks ?
_CRC32[iTrack + 1, oi] : _CRC32[iTrack + 1, oi] :
@@ -510,72 +512,54 @@ namespace CUETools.AccurateRip
return CTDBCRC(0, offset, stride / 2, laststride / 2); return CTDBCRC(0, offset, stride / 2, laststride / 2);
} }
private unsafe static void CalcSyn8(ushort* exp, ushort* log, ushort* syn, uint lo, uint n, int npar) private unsafe static void CalcSyn8(ushort* pt, ushort* syn, uint lo, uint hi)
{ {
syn[0] ^= (ushort)lo; syn[0] ^= (ushort)lo;
uint idx = log[lo] + n; syn[1] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[1] = (ushort)(lo ^ pt[(syn[1] & 255) * 16 + 1] ^ pt[(syn[1] >> 8) * 16 + 1 + 8]);
idx += n; syn[2] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[2] = (ushort)(lo ^ pt[(syn[2] & 255) * 16 + 2] ^ pt[(syn[2] >> 8) * 16 + 2 + 8]);
idx += n; syn[3] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[3] = (ushort)(lo ^ pt[(syn[3] & 255) * 16 + 3] ^ pt[(syn[3] >> 8) * 16 + 3 + 8]);
idx += n; syn[4] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[4] = (ushort)(lo ^ pt[(syn[4] & 255) * 16 + 4] ^ pt[(syn[4] >> 8) * 16 + 4 + 8]);
idx += n; syn[5] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[5] = (ushort)(lo ^ pt[(syn[5] & 255) * 16 + 5] ^ pt[(syn[5] >> 8) * 16 + 5 + 8]);
idx += n; syn[6] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[6] = (ushort)(lo ^ pt[(syn[6] & 255) * 16 + 6] ^ pt[(syn[6] >> 8) * 16 + 6 + 8]);
idx += n; syn[7] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[7] = (ushort)(lo ^ pt[(syn[7] & 255) * 16 + 7] ^ pt[(syn[7] >> 8) * 16 + 7 + 8]);
//for (int i = 8; i < npar; i += 8) syn[8] ^= (ushort)hi;
//{ syn[9] = (ushort)(hi ^ pt[(syn[9] & 255) * 16 + 1] ^ pt[(syn[9] >> 8) * 16 + 1 + 8]);
// idx += n; syn[i] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[10] = (ushort)(hi ^ pt[(syn[10] & 255) * 16 + 2] ^ pt[(syn[10] >> 8) * 16 + 2 + 8]);
// idx += n; syn[i + 1] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[11] = (ushort)(hi ^ pt[(syn[11] & 255) * 16 + 3] ^ pt[(syn[11] >> 8) * 16 + 3 + 8]);
// idx += n; syn[i + 2] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[12] = (ushort)(hi ^ pt[(syn[12] & 255) * 16 + 4] ^ pt[(syn[12] >> 8) * 16 + 4 + 8]);
// idx += n; syn[i + 3] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[13] = (ushort)(hi ^ pt[(syn[13] & 255) * 16 + 5] ^ pt[(syn[13] >> 8) * 16 + 5 + 8]);
// idx += n; syn[i + 4] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[14] = (ushort)(hi ^ pt[(syn[14] & 255) * 16 + 6] ^ pt[(syn[14] >> 8) * 16 + 6 + 8]);
// idx += n; syn[i + 5] ^= exp[(idx & 0xffff) + (idx >> 16)]; syn[15] = (ushort)(hi ^ pt[(syn[15] & 255) * 16 + 7] ^ pt[(syn[15] >> 8) * 16 + 7 + 8]);
// idx += n; syn[i + 6] ^= exp[(idx & 0xffff) + (idx >> 16)];
// idx += n; syn[i + 7] ^= exp[(idx & 0xffff) + (idx >> 16)];
//}
} }
#if alternateSynCalc private unsafe static void CalcPar8(ushort* pt, ushort* wr, uint lo, uint hi)
private unsafe static void CalcSyn8Alt(ushort* exp, ushort* log, ushort* syn, uint lo, uint n)
{ {
uint idx = log[lo] + 7 * n; #if !sdfs
ulong x = exp[(idx & 0xffff) + (idx >> 16)]; uint wrlo = wr[0] ^ lo;
x <<= 16; idx -= n; x ^= exp[(idx & 0xffff) + (idx >> 16)]; uint wrhi = wr[8] ^ hi;
x <<= 16; idx -= n; x ^= exp[(idx & 0xffff) + (idx >> 16)]; ushort* ptiblo0 = pt + (wrlo & 255) * 16;
x <<= 16; idx -= n; x ^= exp[(idx & 0xffff) + (idx >> 16)]; ushort* ptiblo1 = pt + (wrlo >> 8) * 16 + 8;
((ulong*)syn)[1] ^= x; ushort* ptibhi0 = pt + (wrhi & 255) * 16;
idx -= n; x = exp[(idx & 0xffff) + (idx >> 16)]; ushort* ptibhi1 = pt + (wrhi >> 8) * 16 + 8;
x <<= 16; idx -= n; x ^= exp[(idx & 0xffff) + (idx >> 16)]; wr[8] = 0;
x <<= 16; idx -= n; x ^= exp[(idx & 0xffff) + (idx >> 16)]; ((ulong*)wr)[0] = ((ulong*)(wr + 1))[0] ^ ((ulong*)ptiblo0)[0] ^ ((ulong*)ptiblo1)[0];
((ulong*)syn)[0] ^= (x << 16) + lo; ((ulong*)wr)[1] = ((ulong*)(wr + 1))[1] ^ ((ulong*)ptiblo0)[1] ^ ((ulong*)ptiblo1)[1];
((ulong*)wr)[2] = ((ulong*)(wr + 1))[2] ^ ((ulong*)ptibhi0)[0] ^ ((ulong*)ptibhi1)[0];
((ulong*)wr)[3] = (((ulong*)(wr))[3] >> 16) ^ ((ulong*)ptibhi0)[1] ^ ((ulong*)ptibhi1)[1];
#else
const int npar = 8;
ushort* ptiblo = pt + (wr[0] ^ lo) * npar;
ushort* ptibhi = pt + (wr[npar] ^ hi) * npar;
for (int i = 0; i < npar - 1; i++)
{
wr[i] = (ushort)(wr[i + 1] ^ ptiblo[i]);
wr[npar + i] = (ushort)(wr[i + 1 + npar] ^ ptibhi[i]);
} }
wr[npar - 1] = ptiblo[npar - 1];
wr[2 * npar - 1] = ptibhi[npar - 1];
#endif #endif
}
private unsafe static void CalcPar8(ushort* exp, ushort* log, ushort* wr, uint lo)
{
uint ib = wr[0] ^ lo;
if (ib != 0)
{
ushort* myexp = exp + log[ib];
wr[0] = (ushort)(wr[1] ^ myexp[19483]);
wr[1] = (ushort)(wr[2] ^ myexp[41576]);
wr[2] = (ushort)(wr[3] ^ myexp[9460]);
wr[3] = (ushort)(wr[4] ^ myexp[52075]);
wr[4] = (ushort)(wr[5] ^ myexp[9467]);
wr[5] = (ushort)(wr[6] ^ myexp[41590]);
wr[6] = (ushort)(wr[7] ^ myexp[19504]);
wr[7] = myexp[28];
}
else
{
wr[0] = wr[1];
wr[1] = wr[2];
wr[2] = wr[3];
wr[3] = wr[4];
wr[4] = wr[5];
wr[5] = wr[6];
wr[6] = wr[7];
wr[7] = 0;
}
}
/// <summary> /// <summary>
/// This function calculates three different CRCs and also /// This function calculates three different CRCs and also
@@ -591,7 +575,7 @@ namespace CUETools.AccurateRip
/// <param name="pSampleBuff"></param> /// <param name="pSampleBuff"></param>
/// <param name="count"></param> /// <param name="count"></param>
/// <param name="offs"></param> /// <param name="offs"></param>
public unsafe void CalculateCRCs(uint* t, ushort* exp, ushort* log, ushort* syn, ushort* wr, uint* pSampleBuff, int count, int offs) public unsafe void CalculateCRCs(uint* t, ushort* syn, ushort* wr, ushort* pte, ushort* ptd, uint* pSampleBuff, int count, int offs)
{ {
int currentStride = ((int)_sampleCount * 2) / stride; int currentStride = ((int)_sampleCount * 2) / stride;
bool doSyn = currentStride >= 1 && currentStride <= stridecount && calcSyn; bool doSyn = currentStride >= 1 && currentStride <= stridecount && calcSyn;
@@ -635,13 +619,11 @@ namespace CUETools.AccurateRip
crcnl++; crcnl++;
} }
int pk = ((int)(lo << 16)) >> 16;
peak = Math.Max(peak, (pk << 1) ^ (pk >> 31));
if (doSyn && lo != 0) CalcSyn8(exp, log, syn + i * 16, lo, n, npar);
if (doPar) CalcPar8(exp, log, wr + i * 16, lo);
uint hi = sample >> 16; uint hi = sample >> 16;
if (doSyn) CalcSyn8(ptd, syn + i * 16, lo, hi);
if (doPar) CalcPar8(pte, wr + i * 16, lo, hi);
crc32 = (crc32 >> 8) ^ t[(byte)(crc32 ^ hi)]; crc32 = (crc32 >> 8) ^ t[(byte)(crc32 ^ hi)];
crc32 = (crc32 >> 8) ^ t[(byte)(crc32 ^ (hi >> 8))]; crc32 = (crc32 >> 8) ^ t[(byte)(crc32 ^ (hi >> 8))];
if (hi != 0) if (hi != 0)
@@ -651,11 +633,10 @@ namespace CUETools.AccurateRip
crcnl++; crcnl++;
} }
int pk = ((int)(lo << 16)) >> 16;
peak = Math.Max(peak, (pk << 1) ^ (pk >> 31));
pk = ((int)(hi << 16)) >> 16; pk = ((int)(hi << 16)) >> 16;
peak = Math.Max(peak, (pk << 1) ^ (pk >> 31)); peak = Math.Max(peak, (pk << 1) ^ (pk >> 31));
if (doSyn && hi != 0) CalcSyn8(exp, log, syn + i * 16 + 8, hi, n, npar);
if (doPar) CalcPar8(exp, log, wr + i * 16 + 8, hi);
} }
_CRCAR[_currentTrack, 0] = crcar; _CRCAR[_currentTrack, 0] = crcar;
@@ -702,7 +683,7 @@ namespace CUETools.AccurateRip
int pos = 0; int pos = 0;
fixed (uint* t = Crc32.table) fixed (uint* t = Crc32.table)
fixed (ushort* exp = Galois16.instance.ExpTbl, log = Galois16.instance.LogTbl, synptr1 = syndrome) fixed (ushort* synptr1 = syndrome, pte = encodeTable, ptd = decodeTable)
fixed (byte* pSampleBuff = &sampleBuffer.Bytes[0], bpar = parity) fixed (byte* pSampleBuff = &sampleBuffer.Bytes[0], bpar = parity)
while (pos < sampleBuffer.Length) while (pos < sampleBuffer.Length)
{ {
@@ -730,7 +711,7 @@ namespace CUETools.AccurateRip
: _samplesDoneTrack >= 445 * 588 && _samplesDoneTrack <= 455 * 588 ? 2 * maxOffset + 1 + _samplesDoneTrack - 445 * 588 : _samplesDoneTrack >= 445 * 588 && _samplesDoneTrack <= 455 * 588 ? 2 * maxOffset + 1 + _samplesDoneTrack - 445 * 588
: -1; : -1;
CalculateCRCs(t, exp, log, synptr, wr, samples, copyCount, offset); CalculateCRCs(t, synptr, wr, pte, ptd, samples, copyCount, offset);
// duplicate prefix to suffix // duplicate prefix to suffix
if (_samplesDoneTrack < maxOffset && _samplesRemTrack <= maxOffset) if (_samplesDoneTrack < maxOffset && _samplesRemTrack <= maxOffset)
@@ -807,8 +788,8 @@ namespace CUETools.AccurateRip
for (int iTrack = 0; iTrack <= _toc.AudioTracks; iTrack++) for (int iTrack = 0; iTrack <= _toc.AudioTracks; iTrack++)
{ {
// ??? int tempLocation = (int) (iTrack == 0 ? _toc[_toc.FirstAudio][0].Start : _toc[_toc.FirstAudio + iTrack - 1].Start) * 588; // ??? int tempLocation = (int) (iTrack == 0 ? _toc[_toc.FirstAudio][0].Start : _toc[_toc.FirstAudio + iTrack - 1].Start) * 588;
int tempLocation = (int) (iTrack == 0 ? 0 : _toc[_toc.FirstAudio + iTrack - 1].Start - _toc[_toc.FirstAudio][0].Start) * 588; int tempLocation = (int)(iTrack == 0 ? 0 : _toc[_toc.FirstAudio + iTrack - 1].Start - _toc[_toc.FirstAudio][0].Start) * 588;
int tempLen = (int) (iTrack == 0 ? _toc[_toc.FirstAudio].Pregap : _toc[_toc.FirstAudio + iTrack - 1].Length) * 588; int tempLen = (int)(iTrack == 0 ? _toc[_toc.FirstAudio].Pregap : _toc[_toc.FirstAudio + iTrack - 1].Length) * 588;
int trStart = Math.Max(tempLocation, start); int trStart = Math.Max(tempLocation, start);
int trEnd = Math.Min(tempLocation + tempLen, end); int trEnd = Math.Min(tempLocation + tempLen, end);
if (trStart >= trEnd) if (trStart >= trEnd)
@@ -872,6 +853,11 @@ namespace CUETools.AccurateRip
_Peak = new int[_toc.AudioTracks + 1]; _Peak = new int[_toc.AudioTracks + 1];
syndrome = new ushort[calcSyn ? stride : 1, npar]; syndrome = new ushort[calcSyn ? stride : 1, npar];
parity = new byte[stride * npar * 2]; parity = new byte[stride * npar * 2];
if (calcParity && npar == 8)
encodeTable = Galois16.instance.makeEncodeTable(npar);
if (calcSyn && npar == 8)
decodeTable = Galois16.instance.makeDecodeTable(npar);
int leadin_len = Math.Max(4096 * 4, (calcSyn || calcParity) ? stride * 2 : 0); int leadin_len = Math.Max(4096 * 4, (calcSyn || calcParity) ? stride * 2 : 0);
int leadout_len = Math.Max(4096 * 4, (calcSyn || calcParity) ? stride + laststride : 0); int leadout_len = Math.Max(4096 * 4, (calcSyn || calcParity) ? stride + laststride : 0);
leadin = new ushort[leadin_len]; leadin = new ushort[leadin_len];
@@ -886,8 +872,8 @@ namespace CUETools.AccurateRip
} }
static DateTime last_accessed; static DateTime last_accessed;
static readonly TimeSpan min_interval = new TimeSpan (5000000); // 0.5 second static readonly TimeSpan min_interval = new TimeSpan(5000000); // 0.5 second
static readonly object server_mutex = new object (); static readonly object server_mutex = new object();
public void ContactAccurateRip(string accurateRipId) public void ContactAccurateRip(string accurateRipId)
{ {
@@ -1106,7 +1092,7 @@ namespace CUETools.AccurateRip
conf += AccDisks[di].tracks[trno].count; conf += AccDisks[di].tracks[trno].count;
if (crc450OI == AccDisks[di].tracks[trno].Frame450CRC if (crc450OI == AccDisks[di].tracks[trno].Frame450CRC
&& 0 != AccDisks[di].tracks[trno].Frame450CRC) && 0 != AccDisks[di].tracks[trno].Frame450CRC)
partials ++; partials++;
} }
string status; string status;
if (conf > 0) if (conf > 0)
@@ -1319,7 +1305,7 @@ namespace CUETools.AccurateRip
public static bool FindDriveReadOffset(string driveName, out int driveReadOffset) public static bool FindDriveReadOffset(string driveName, out int driveReadOffset)
{ {
string fileName = System.IO.Path.Combine(CachePath, "DriveOffsets.bin"); string fileName = System.IO.Path.Combine(CachePath, "DriveOffsets.bin");
if (!File.Exists(fileName) || (DateTime.Now - File.GetLastWriteTime(fileName) > TimeSpan.FromDays(10)) ) if (!File.Exists(fileName) || (DateTime.Now - File.GetLastWriteTime(fileName) > TimeSpan.FromDays(10)))
{ {
HttpWebRequest req = (HttpWebRequest)WebRequest.Create("http://www.accuraterip.com/accuraterip/DriveOffsets.bin"); HttpWebRequest req = (HttpWebRequest)WebRequest.Create("http://www.accuraterip.com/accuraterip/DriveOffsets.bin");
req.Method = "GET"; req.Method = "GET";

8
CUETools.AccurateRip/CDRepair.cs
View File

@@ -438,6 +438,14 @@ namespace CUETools.AccurateRip
} }
} }
public ushort[,] Syndrome
{
get
{
return ar.syndrome;
}
}
public byte[] Parity public byte[] Parity
{ {
get get

BIN
CUETools.Parity/Galois.cs
View File

Binary file not shown.

30
CUETools/CUETools.TestParity/CDRepairDecodeTest.cs
View File

@@ -91,7 +91,8 @@ namespace CUETools.TestParity
[TestMethod()] [TestMethod()]
public void CDRepairEncodeWriteTest() public void CDRepairEncodeWriteTest()
{ {
Assert.AreEqual<string>("jvR9QJ1cSWo=", Convert.ToBase64String(encode.Parity, 0, 8)); Assert.AreEqual<string>("jvR9QJ1cSWpqbyP0I0tBrBkQRjCDTDDQkttZGj14ROvsXyg+AnnxVKxL7gwLZbrQmTw5ZPps1Q3744g94qaOOQ==",
Convert.ToBase64String(encode.Parity, 0, 64));
Assert.AreEqual<uint>(377539636, encode.CRC); Assert.AreEqual<uint>(377539636, encode.CRC);
} }
@@ -207,7 +208,7 @@ namespace CUETools.TestParity
var decode = generator2.CreateCDRepairEncode(stride, npar, true, false); var decode = generator2.CreateCDRepairEncode(stride, npar, true, false);
int actualOffset; int actualOffset;
bool hasErrors; bool hasErrors;
Assert.IsTrue(decode.FindOffset(encode.NPAR, encode.Parity, 0, encode.CRC, out actualOffset, out hasErrors)); Assert.IsTrue(decode.FindOffset(encode.NPAR, encode.Parity, 0, encode.CRC, out actualOffset, out hasErrors), "couldn't find offset");
Assert.IsTrue(hasErrors, "doesn't have errors"); Assert.IsTrue(hasErrors, "doesn't have errors");
Assert.AreEqual(-offset, actualOffset, "wrong offset"); Assert.AreEqual(-offset, actualOffset, "wrong offset");
CDRepairFix fix = decode.VerifyParity(encode.Parity, actualOffset); CDRepairFix fix = decode.VerifyParity(encode.Parity, actualOffset);
@@ -216,5 +217,30 @@ namespace CUETools.TestParity
generator2.Write(fix); generator2.Write(fix);
Assert.AreEqual<uint>(encode.CRC, fix.CRC); Assert.AreEqual<uint>(encode.CRC, fix.CRC);
} }
//[TestMethod]
//public void CDRepairDecodeSpeedTest()
//{
// var generator = new TestImageGenerator("0 75000", seed, 0, 0);
// var encode = generator.CreateCDRepairEncode(stride, npar, true, false);
// var syn = new byte[64];
// for (int i = 0; i < 4; i++)
// for (int j = 0; j < 8; j++)
// {
// syn[(i * 8 + j) * 2] = (byte)encode.Syndrome[i, j];
// syn[(i * 8 + j) * 2 + 1] = (byte)(encode.Syndrome[i, j] >> 8);
// }
// Assert.AreEqual<string>("YJPyo4+KY35P+DpljMplMGbMWXmpvhkdDOCKeEo4NDoRPPW7D0cv8hmLb7yZujp0sVg/6AEWKY5QrDKkiYp0Zw==",
// Convert.ToBase64String(syn));
//}
//[TestMethod]
//public void CDRepairEncodeSpeedTest()
//{
// var generator = new TestImageGenerator("0 75000", seed, 0, 0);
// var encode = generator.CreateCDRepairEncode(stride, npar, false, true);
// Assert.AreEqual<string>("CWgEDNLjSi22nIOyaeyp+12R3UCVWlzIb+nbv8XWXg9YEhkHxYr8xqrr1+hIbFwKNEXnj0esJrKbiW3XGbHsYw==",
// Convert.ToBase64String(encode.Parity, 0, 64));
//}
} }
} }