Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions PanoramicData.SoundPrint/Fingerprinter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -381,22 +381,38 @@ private void EmitPairs(int anchorIndex)
var taken = 0;
for (var j = anchorIndex + 1; j < _peaks.Count && taken < _options.FanOut; j++)
{
var partner = _peaks[j];
var deltaFrames = partner.Frame - anchor.Frame;
if (deltaFrames > _options.MaxDeltaFrames)
if (TakeNextPair(anchor, _peaks[j]))
{
break;
taken++;
}

var deltaBins = partner.Bin - anchor.Bin;
if (deltaFrames < 1 || deltaBins is < -128 or > 127)
else if (ExhaustedPartner(_peaks[j].Frame, anchor.Frame))
{
continue;
break;
}
}
}

private bool TakeNextPair(Peak anchor, Peak partner)
{
var deltaFrames = partner.Frame - anchor.Frame;
if (deltaFrames > _options.MaxDeltaFrames)
{
return false;
}

AddLandmark(new Landmark(((uint)anchor.Bin << 14) | ((uint)(deltaBins + 128) << 6) | (uint)deltaFrames, anchor.Frame));
taken++;
var deltaBins = partner.Bin - anchor.Bin;
if (deltaFrames < 1 || deltaBins is < -128 or > 127)
{
return false;
}

AddLandmark(new Landmark(((uint)anchor.Bin << 14) | ((uint)(deltaBins + 128) << 6) | (uint)deltaFrames, anchor.Frame));
return true;
}

private bool ExhaustedPartner(long partnerFrame, long anchorFrame)
{
return partnerFrame - anchorFrame > _options.MaxDeltaFrames;
}

private void AddLandmark(Landmark landmark)
Expand Down