nosklo
/
bpm-tools
mirror of http://www.pogo.org.uk/~mark/bpm-tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Weight closer beats more than those further away

This commit is contained in:
Mark Hills 2012-01-14 16:46:19 +00:00
parent 3eb56b4d84
commit e528946643
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bpm.c
View File

@ -62,7 +62,7 @@ static double sample(float nrg[], size_t len, double offset)
double autodifference(float nrg[], size_t len, double interval) double autodifference(float nrg[], size_t len, double interval)
{ {
size_t n; size_t n;
double mid, v, diff; double mid, v, diff, total;
static const double beats[] = { -32, -16, -8, -4, -2, -1, static const double beats[] = { -32, -16, -8, -4, -2, -1,
1, 2, 4, 8, 16, 32 }, 1, 2, 4, 8, 16, 32 },
nobeats[] = { -0.5, -0.25, 0.25, 0.5 }; nobeats[] = { -0.5, -0.25, 0.25, 0.5 };
@ -71,21 +71,29 @@ double autodifference(float nrg[], size_t len, double interval)
v = sample(nrg, len, mid); v = sample(nrg, len, mid);
diff = 0.0; diff = 0.0;
total = 0.0;
for (n = 0; n < ARRAY_SIZE(beats); n++) { for (n = 0; n < ARRAY_SIZE(beats); n++) {
double y; double y, w;
y = sample(nrg, len, mid + beats[n] * interval); y = sample(nrg, len, mid + beats[n] * interval);
diff += fabs(y - v);
w = 1.0 / fabs(beats[n]);
diff += w * fabs(y - v);
total += w;
} }
for (n = 0; n < ARRAY_SIZE(nobeats); n++) { for (n = 0; n < ARRAY_SIZE(nobeats); n++) {
double y; double y, w;
y = sample(nrg, len, mid + nobeats[n] * interval); y = sample(nrg, len, mid + nobeats[n] * interval);
diff -= fabs(y - v);
w = fabs(nobeats[n]);
diff -= w * fabs(y - v);
total += w;
} }
return diff / (ARRAY_SIZE(beats) + ARRAY_SIZE(nobeats)); return diff / total;
} }
/* /*