@sudobility/music_player 0.1.23 → 0.1.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/shared/humanize.d.ts +11 -0
- package/dist/shared/humanize.d.ts.map +1 -0
- package/dist/shared/humanize.js +80 -0
- package/dist/shared/humanize.js.map +1 -0
- package/dist/shared/plan.d.ts +5 -1
- package/dist/shared/plan.d.ts.map +1 -1
- package/dist/shared/plan.js +6 -2
- package/dist/shared/plan.js.map +1 -1
- package/dist/shared/render-events.d.ts +5 -1
- package/dist/shared/render-events.d.ts.map +1 -1
- package/dist/shared/render-events.js +8 -2
- package/dist/shared/render-events.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { Score } from '@sudobility/music_types';
|
|
2
|
+
export type HumanizableNote = {
|
|
3
|
+
tick: number;
|
|
4
|
+
durTicks: number;
|
|
5
|
+
midi: number;
|
|
6
|
+
velocity: number;
|
|
7
|
+
trackId: string;
|
|
8
|
+
noteId: string;
|
|
9
|
+
};
|
|
10
|
+
export declare function humanizeNotes<T extends HumanizableNote>(notes: readonly T[], score: Score): T[];
|
|
11
|
+
//# sourceMappingURL=humanize.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"humanize.d.ts","sourceRoot":"","sources":["../../src/shared/humanize.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAErD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA4BF,wBAAgB,aAAa,CAAC,CAAC,SAAS,eAAe,EACrD,KAAK,EAAE,SAAS,CAAC,EAAE,EACnB,KAAK,EAAE,KAAK,GACX,CAAC,EAAE,CAoCL"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The small timing and weight a player puts on notes, applied at playback.
|
|
3
|
+
*
|
|
4
|
+
* Every generated note sits exactly on the grid at a flat velocity, and that is
|
|
5
|
+
* a large part of why generated music sounds mechanical: no drummer lands every
|
|
6
|
+
* snare on the same tick, no bassist plays every note at one weight. This adds
|
|
7
|
+
* the feel back when the score is SOUNDED, never to the score itself — moving
|
|
8
|
+
* stored notes off the grid would break the notation into tuplets and ties for
|
|
9
|
+
* a difference measured in milliseconds.
|
|
10
|
+
*
|
|
11
|
+
* Deterministic on purpose: every offset comes from a hash of the note's id, so
|
|
12
|
+
* a piece sounds the same every time it is played, and live playback and the
|
|
13
|
+
* exported audio file cannot differ. MIDI export stays exact, which is what a
|
|
14
|
+
* DAW user importing the file wants.
|
|
15
|
+
*
|
|
16
|
+
* The amounts are small and stated in ticks at 480 per quarter, scaled to the
|
|
17
|
+
* score's ppq. At 120 bpm one such tick is about a millisecond.
|
|
18
|
+
*/
|
|
19
|
+
import { isPercussionTrack, gmFamilyOf } from '@sudobility/music_types';
|
|
20
|
+
/** How far any note may drift either way, in 480ths of a quarter. */
|
|
21
|
+
const JITTER = 3;
|
|
22
|
+
/** A snare or clap on the backbeat lands this much late: laid back. */
|
|
23
|
+
const SNARE_LAY_BACK = 6;
|
|
24
|
+
/** A bass note lands this much early: pushing the beat. */
|
|
25
|
+
const BASS_PUSH = 4;
|
|
26
|
+
/** How much lighter an off-beat hi-hat is than an on-beat one. */
|
|
27
|
+
const HAT_OFFBEAT_LIGHTER = 10;
|
|
28
|
+
/** How far velocity drifts either way. */
|
|
29
|
+
const VELOCITY_JITTER = 5;
|
|
30
|
+
const SNARES = new Set([37, 38, 39, 40]);
|
|
31
|
+
const HATS = new Set([42, 44, 46]);
|
|
32
|
+
/** Two stable values in [-1, 1] from a note id (FNV-1a). */
|
|
33
|
+
function drift(id) {
|
|
34
|
+
let h = 0x811c9dc5;
|
|
35
|
+
for (let i = 0; i < id.length; i += 1) {
|
|
36
|
+
h ^= id.charCodeAt(i);
|
|
37
|
+
h = Math.imul(h, 0x01000193);
|
|
38
|
+
}
|
|
39
|
+
const a = ((h >>> 0) % 2001) / 1000 - 1;
|
|
40
|
+
const b = (((h >>> 11) >>> 0) % 2001) / 1000 - 1;
|
|
41
|
+
return [a, b];
|
|
42
|
+
}
|
|
43
|
+
export function humanizeNotes(notes, score) {
|
|
44
|
+
const unit = score.ppq / 480;
|
|
45
|
+
const kind = new Map(score.tracks.map(track => [
|
|
46
|
+
track.id,
|
|
47
|
+
isPercussionTrack(track)
|
|
48
|
+
? 'drums'
|
|
49
|
+
: track.clef === 'bass' || gmFamilyOf(track.midiProgram) === 'bass'
|
|
50
|
+
? 'bass'
|
|
51
|
+
: 'other',
|
|
52
|
+
]));
|
|
53
|
+
const beat = score.ppq;
|
|
54
|
+
const half = score.ppq / 2;
|
|
55
|
+
return notes
|
|
56
|
+
.map(note => {
|
|
57
|
+
const [t, v] = drift(note.noteId);
|
|
58
|
+
const role = kind.get(note.trackId) ?? 'other';
|
|
59
|
+
let shift = t * JITTER * unit;
|
|
60
|
+
let velocity = note.velocity + v * VELOCITY_JITTER;
|
|
61
|
+
if (role === 'drums') {
|
|
62
|
+
const onBeat = note.tick % beat === 0;
|
|
63
|
+
const offBeat = note.tick % beat === half;
|
|
64
|
+
if (SNARES.has(note.midi) && onBeat)
|
|
65
|
+
shift += SNARE_LAY_BACK * unit;
|
|
66
|
+
if (HATS.has(note.midi) && offBeat)
|
|
67
|
+
velocity -= HAT_OFFBEAT_LIGHTER;
|
|
68
|
+
}
|
|
69
|
+
else if (role === 'bass') {
|
|
70
|
+
shift -= BASS_PUSH * unit;
|
|
71
|
+
}
|
|
72
|
+
return {
|
|
73
|
+
...note,
|
|
74
|
+
tick: Math.max(0, Math.round(note.tick + shift)),
|
|
75
|
+
velocity: Math.max(1, Math.min(127, Math.round(velocity))),
|
|
76
|
+
};
|
|
77
|
+
})
|
|
78
|
+
.sort((a, b) => a.tick - b.tick);
|
|
79
|
+
}
|
|
80
|
+
//# sourceMappingURL=humanize.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"humanize.js","sourceRoot":"","sources":["../../src/shared/humanize.ts"],"names":[],"mappings":"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"}
|
package/dist/shared/plan.d.ts
CHANGED
|
@@ -30,5 +30,9 @@ export declare function resolveVoice(program: number, isPercussion: boolean, fal
|
|
|
30
30
|
* rebuild every note — `PlaybackEngine.applyMix` takes only this.
|
|
31
31
|
*/
|
|
32
32
|
export declare function playbackTracks(score: Score): PlaybackTrack[];
|
|
33
|
-
export declare function playbackPlan(score: Score
|
|
33
|
+
export declare function playbackPlan(score: Score,
|
|
34
|
+
/** Off only for tests that assert exact ticks; playback is humanized (`humanize.ts`). */
|
|
35
|
+
options?: {
|
|
36
|
+
humanize?: boolean;
|
|
37
|
+
}): PlaybackPlan;
|
|
34
38
|
//# sourceMappingURL=plan.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../src/shared/plan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAEV,YAAY,EACZ,aAAa,EACb,KAAK,EACN,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../src/shared/plan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAEV,YAAY,EACZ,aAAa,EACb,KAAK,EACN,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAclD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,OAAO,EACrB,YAAY,SAAK,GAChB,aAAa,CAUf;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,aAAa,EAAE,CAqB5D;AAqDD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,KAAK;AACZ,yFAAyF;AACzF,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAO,GACnC,YAAY,CAiDd"}
|
package/dist/shared/plan.js
CHANGED
|
@@ -6,6 +6,7 @@ import { beatBoundaries } from '@sudobility/music_types';
|
|
|
6
6
|
import { gmInstrument } from '@sudobility/music_types';
|
|
7
7
|
import { gmKitAt } from '@sudobility/music_types';
|
|
8
8
|
import { isPercussionTrack } from '@sudobility/music_types';
|
|
9
|
+
import { humanizeNotes } from './humanize.js';
|
|
9
10
|
/**
|
|
10
11
|
* The GM voice a program addresses.
|
|
11
12
|
*
|
|
@@ -96,7 +97,9 @@ function expandAlongTimeline(events, timeline, withTick) {
|
|
|
96
97
|
}
|
|
97
98
|
return expanded.sort((a, b) => a.tick - b.tick);
|
|
98
99
|
}
|
|
99
|
-
export function playbackPlan(score
|
|
100
|
+
export function playbackPlan(score,
|
|
101
|
+
/** Off only for tests that assert exact ticks; playback is humanized (`humanize.ts`). */
|
|
102
|
+
options = {}) {
|
|
100
103
|
const timeline = performanceTimeline(score);
|
|
101
104
|
/*
|
|
102
105
|
Notes are laid out in *performance* time, so a repeated bar genuinely
|
|
@@ -104,7 +107,8 @@ export function playbackPlan(score) {
|
|
|
104
107
|
— see `sourceTickFor` — which is what keeps the score the canonical,
|
|
105
108
|
written thing rather than teaching the caret about repeats.
|
|
106
109
|
*/
|
|
107
|
-
const
|
|
110
|
+
const flat = flattenScoreNotes(score);
|
|
111
|
+
const notes = expandAlongTimeline(options.humanize === false ? flat : humanizeNotes(flat, score), timeline, (note, tick, pass) => ({
|
|
108
112
|
...note,
|
|
109
113
|
tick,
|
|
110
114
|
// Distinct per pass: the caret lights a note by id, and one written
|
package/dist/shared/plan.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../src/shared/plan.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EACL,mBAAmB,GAEpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../src/shared/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,5 +21,9 @@ export type { RenderEvent, RenderPlan, RenderTrack, } from '@sudobility/music_ty
|
|
|
21
21
|
* same traversal `playbackPlan` uses. Walking the score separately is what let
|
|
22
22
|
* the two drift over ties.
|
|
23
23
|
*/
|
|
24
|
-
export declare function renderEvents(score: Score
|
|
24
|
+
export declare function renderEvents(score: Score,
|
|
25
|
+
/** Off only for tests that assert exact ticks; the exported file is humanized like live playback. */
|
|
26
|
+
options?: {
|
|
27
|
+
humanize?: boolean;
|
|
28
|
+
}): RenderPlan;
|
|
25
29
|
//# sourceMappingURL=render-events.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-events.d.ts","sourceRoot":"","sources":["../../src/shared/render-events.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"render-events.d.ts","sourceRoot":"","sources":["../../src/shared/render-events.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,KAAK,EAEV,UAAU,EAEX,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACV,WAAW,EACX,UAAU,EACV,WAAW,GACZ,MAAM,yBAAyB,CAAC;AAKjC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,KAAK;AACZ,qGAAqG;AACrG,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAO,GACnC,UAAU,CAyDZ"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
import { TempoMap } from '@sudobility/music_types';
|
|
10
10
|
import { fermataTempoMap } from '@sudobility/music_types';
|
|
11
11
|
import { flattenScoreNotes } from '@sudobility/music_types';
|
|
12
|
+
import { humanizeNotes } from './humanize.js';
|
|
12
13
|
import { resolveVoice } from './plan.js';
|
|
13
14
|
/** Release tail, so the last note is not cut off mid-decay. */
|
|
14
15
|
const TAIL_SEC = 1;
|
|
@@ -32,7 +33,9 @@ const TAIL_SEC = 1;
|
|
|
32
33
|
* same traversal `playbackPlan` uses. Walking the score separately is what let
|
|
33
34
|
* the two drift over ties.
|
|
34
35
|
*/
|
|
35
|
-
export function renderEvents(score
|
|
36
|
+
export function renderEvents(score,
|
|
37
|
+
/** Off only for tests that assert exact ticks; the exported file is humanized like live playback. */
|
|
38
|
+
options = {}) {
|
|
36
39
|
// The same derived map live playback uses, so an exported file holds its
|
|
37
40
|
// pauses for exactly as long as the transport just did.
|
|
38
41
|
const tempoMap = new TempoMap(fermataTempoMap(score), score.ppq);
|
|
@@ -58,7 +61,10 @@ export function renderEvents(score) {
|
|
|
58
61
|
// on screen — measured: one note of 960 ticks live, two of 0.5s offline.
|
|
59
62
|
const silenced = new Set(score.tracks.filter(t => (anySolo ? !t.solo : t.muted)).map(t => t.id));
|
|
60
63
|
const events = [];
|
|
61
|
-
|
|
64
|
+
const flat = flattenScoreNotes(score);
|
|
65
|
+
for (const note of options.humanize === false
|
|
66
|
+
? flat
|
|
67
|
+
: humanizeNotes(flat, score)) {
|
|
62
68
|
if (silenced.has(note.trackId))
|
|
63
69
|
continue;
|
|
64
70
|
const startSec = tempoMap.ticksToSeconds(note.tick);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-events.js","sourceRoot":"","sources":["../../src/shared/render-events.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAczC,+DAA+D;AAC/D,MAAM,QAAQ,GAAG,CAAC,CAAC;AAEnB;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,YAAY,
|
|
1
|
+
{"version":3,"file":"render-events.js","sourceRoot":"","sources":["../../src/shared/render-events.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sudobility/music_player",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.24",
|
|
4
4
|
"description": "Playback for ScoreSmith: transport, synth engines and offline rendering, for web and React Native",
|
|
5
5
|
"author": "Sudobility",
|
|
6
6
|
"license": "BUSL-1.1",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"prepublishOnly": "bun run clean && bun run verify"
|
|
74
74
|
},
|
|
75
75
|
"peerDependencies": {
|
|
76
|
-
"@sudobility/music_types": "^0.13.
|
|
76
|
+
"@sudobility/music_types": "^0.13.23",
|
|
77
77
|
"js-synthesizer": "^1.13.0",
|
|
78
78
|
"react-native-audio-api": ">=0.13.0"
|
|
79
79
|
},
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
},
|
|
88
88
|
"devDependencies": {
|
|
89
89
|
"@eslint/js": "^10.0.1",
|
|
90
|
-
"@sudobility/music_types": "^0.13.
|
|
90
|
+
"@sudobility/music_types": "^0.13.23",
|
|
91
91
|
"@types/node": "^26.2.0",
|
|
92
92
|
"@typescript-eslint/eslint-plugin": "^8.65.0",
|
|
93
93
|
"@typescript-eslint/parser": "^8.65.0",
|