@omnimedia/omnitool 1.1.0-52 → 1.1.0-55
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/package.json +1 -1
- package/s/demo/routines/transcode-test.ts +2 -2
- package/s/demo/routines/transitions-test.ts +2 -2
- package/s/driver/driver.ts +26 -5
- package/s/driver/fns/schematic.ts +2 -0
- package/s/driver/fns/work.ts +41 -20
- package/s/timeline/parts/waveform.ts +1 -1
- package/s/timeline/renderers/export/parts/cursor.ts +75 -56
- package/s/timeline/renderers/export/parts/produce-video.ts +2 -3
- package/s/timeline/renderers/player/parts/playback.ts +33 -6
- package/s/timeline/renderers/player/player.ts +2 -14
- package/s/timeline/renderers/renderers.test.ts +1 -3
- package/s/timeline/sugar/o.ts +10 -10
- package/x/demo/demo.bundle.min.js +9 -9
- package/x/demo/demo.bundle.min.js.map +4 -4
- package/x/demo/routines/transcode-test.js +2 -2
- package/x/demo/routines/transcode-test.js.map +1 -1
- package/x/demo/routines/transitions-test.js +2 -2
- package/x/demo/routines/transitions-test.js.map +1 -1
- package/x/driver/driver.d.ts +14 -2
- package/x/driver/driver.js +26 -5
- package/x/driver/driver.js.map +1 -1
- package/x/driver/driver.worker.bundle.min.js +1 -1
- package/x/driver/driver.worker.bundle.min.js.map +3 -3
- package/x/driver/fns/host.d.ts +2 -0
- package/x/driver/fns/schematic.d.ts +2 -0
- package/x/driver/fns/work.d.ts +2 -0
- package/x/driver/fns/work.js +33 -20
- package/x/driver/fns/work.js.map +1 -1
- package/x/index.html +2 -2
- package/x/tests.bundle.min.js +16 -16
- package/x/tests.bundle.min.js.map +4 -4
- package/x/tests.html +1 -1
- package/x/timeline/parts/waveform.js +1 -1
- package/x/timeline/parts/waveform.js.map +1 -1
- package/x/timeline/renderers/export/parts/cursor.d.ts +4 -5
- package/x/timeline/renderers/export/parts/cursor.js +68 -50
- package/x/timeline/renderers/export/parts/cursor.js.map +1 -1
- package/x/timeline/renderers/export/parts/produce-video.js +2 -3
- package/x/timeline/renderers/export/parts/produce-video.js.map +1 -1
- package/x/timeline/renderers/player/parts/playback.d.ts +9 -5
- package/x/timeline/renderers/player/parts/playback.js +25 -6
- package/x/timeline/renderers/player/parts/playback.js.map +1 -1
- package/x/timeline/renderers/player/player.js +2 -9
- package/x/timeline/renderers/player/player.js.map +1 -1
- package/x/timeline/renderers/renderers.test.js +1 -2
- package/x/timeline/renderers/renderers.test.js.map +1 -1
- package/x/timeline/sugar/o.d.ts +1 -0
- package/x/timeline/sugar/o.js +10 -10
- package/x/timeline/sugar/o.js.map +1 -1
package/x/tests.html
CHANGED
|
@@ -14,7 +14,7 @@ export class Waveform {
|
|
|
14
14
|
});
|
|
15
15
|
}
|
|
16
16
|
static async init(driver, source, container) {
|
|
17
|
-
const reader = driver.decodeAudio({ source }).getReader();
|
|
17
|
+
const reader = driver.decodeAudio({ source }).readable.getReader();
|
|
18
18
|
const peaks = [];
|
|
19
19
|
let buffer = [];
|
|
20
20
|
const samplesPerPeak = 1024;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waveform.js","sourceRoot":"","sources":["../../../s/timeline/parts/waveform.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,eAAe,CAAA;AAKtC,MAAM,OAAO,QAAQ;IACpB,UAAU,CAAY;IAEtB,YAAY,KAAe,EAAE,SAAsB,EAAE,QAAgB;QACpE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC;YAClC,SAAS;YACT,SAAS,EAAE,kBAAkB;YAC7B,aAAa,EAAE,kBAAkB;YACjC,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,EAAE;YACb,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,CAAC,KAAK,CAAC;YACd,QAAQ;SACT,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,MAAqB,EAAE,SAAsB;QAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC,SAAS,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"waveform.js","sourceRoot":"","sources":["../../../s/timeline/parts/waveform.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,eAAe,CAAA;AAKtC,MAAM,OAAO,QAAQ;IACpB,UAAU,CAAY;IAEtB,YAAY,KAAe,EAAE,SAAsB,EAAE,QAAgB;QACpE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC;YAClC,SAAS;YACT,SAAS,EAAE,kBAAkB;YAC7B,aAAa,EAAE,kBAAkB;YACjC,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,EAAE;YACb,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,CAAC,KAAK,CAAC;YACd,QAAQ;SACT,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,MAAqB,EAAE,SAAsB;QAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAA;QAEhE,MAAM,KAAK,GAAa,EAAE,CAAA;QAC1B,IAAI,MAAM,GAAa,EAAE,CAAA;QACzB,MAAM,cAAc,GAAG,IAAI,CAAA;QAC3B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QAEtD,OAAO,IAAI,EAAE,CAAC;YACb,MAAM,EAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAC,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;YACpD,IAAI,IAAI;gBAAE,MAAK;YAEf,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAA;YACvC,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAA;YACtC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,EAAC,UAAU,EAAE,CAAC,EAAC,CAAC,CAAA,CAAC,wBAAwB;YAEjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACvC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;gBACrB,IAAI,MAAM,CAAC,MAAM,IAAI,cAAc,EAAE,CAAC;oBACrC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;oBAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;oBAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;oBAC9B,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;gBACrB,CAAC;YACF,CAAC;YAED,SAAS,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;QAED,OAAO,IAAI,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,4BAA4B;IAC5B,+BAA+B;IAC/B,IAAI;IAEJ,IAAI,KAAK,CAAC,KAAa;QACtB,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAA;IAC3C,CAAC;CACD"}
|
|
@@ -11,9 +11,8 @@ export declare class CursorVisualSampler {
|
|
|
11
11
|
#private;
|
|
12
12
|
private driver;
|
|
13
13
|
private resolveMedia;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
};
|
|
14
|
+
private timeline;
|
|
15
|
+
constructor(driver: Driver, resolveMedia: (hash: string) => DecoderSource, timeline: TimelineFile);
|
|
16
|
+
next(timecode: Ms): Promise<import("../../../../driver/fns/schematic.js").Layer[]>;
|
|
17
|
+
cancel(): Promise<void>;
|
|
19
18
|
}
|
|
@@ -8,71 +8,89 @@ import { createVisualSampler } from "../../parts/samplers/visual/sampler.js";
|
|
|
8
8
|
export class CursorVisualSampler {
|
|
9
9
|
driver;
|
|
10
10
|
resolveMedia;
|
|
11
|
-
|
|
11
|
+
timeline;
|
|
12
|
+
#lastTimecode = -Infinity;
|
|
12
13
|
#videoCursors = new Map();
|
|
13
|
-
|
|
14
|
+
#sampler;
|
|
15
|
+
constructor(driver, resolveMedia, timeline) {
|
|
14
16
|
this.driver = driver;
|
|
15
17
|
this.resolveMedia = resolveMedia;
|
|
16
|
-
this
|
|
17
|
-
|
|
18
|
-
const
|
|
19
|
-
|
|
18
|
+
this.timeline = timeline;
|
|
19
|
+
this.#sampler = createVisualSampler(this.resolveMedia, (item, time) => {
|
|
20
|
+
const targetUs = toUs(time);
|
|
21
|
+
let cursor = this.#videoCursors.get(item.id);
|
|
22
|
+
if (!cursor) {
|
|
23
|
+
const source = this.resolveMedia(item.mediaHash);
|
|
24
|
+
const endUs = toUs(ms(item.start + item.duration));
|
|
25
|
+
cursor = this.#createVideoCursor(source, targetUs, endUs);
|
|
26
|
+
this.#videoCursors.set(item.id, cursor);
|
|
27
|
+
}
|
|
28
|
+
return cursor.next(targetUs);
|
|
20
29
|
});
|
|
21
30
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
throw new Error(`CursorVisualSampler is forward-only: requested ${timecode}ms after ${lastTimecode}ms`);
|
|
28
|
-
lastTimecode = timecode;
|
|
29
|
-
return this.#sampler.sample(timeline, timecode);
|
|
30
|
-
},
|
|
31
|
-
cancel: () => this.#cancel(),
|
|
32
|
-
};
|
|
33
|
-
}
|
|
34
|
-
#getCursorForVideo(videoItem) {
|
|
35
|
-
const existing = this.#videoCursors.get(videoItem.id);
|
|
36
|
-
if (existing)
|
|
37
|
-
return existing;
|
|
38
|
-
const source = this.resolveMedia(videoItem.mediaHash);
|
|
39
|
-
const video = this.driver.decodeVideo({ source });
|
|
40
|
-
const cursor = this.#cursor(video.getReader());
|
|
41
|
-
this.#videoCursors.set(videoItem.id, cursor);
|
|
42
|
-
return cursor;
|
|
31
|
+
next(timecode) {
|
|
32
|
+
if (timecode < this.#lastTimecode)
|
|
33
|
+
throw new Error(`Forward-only cursor regression: ${timecode}ms < ${this.#lastTimecode}ms`);
|
|
34
|
+
this.#lastTimecode = timecode;
|
|
35
|
+
return this.#sampler.sample(this.timeline, timecode);
|
|
43
36
|
}
|
|
44
|
-
async
|
|
45
|
-
await Promise.all([...this.#videoCursors.values()].map(
|
|
37
|
+
async cancel() {
|
|
38
|
+
await Promise.all([...this.#videoCursors.values()].map(c => c.cancel()));
|
|
46
39
|
this.#videoCursors.clear();
|
|
47
40
|
}
|
|
48
|
-
|
|
49
|
-
|
|
41
|
+
#createVideoCursor(source, startUs, endUs) {
|
|
42
|
+
const video = this.driver.decodeVideo({ source, start: startUs / 1_000_000, end: endUs / 1_000_000 });
|
|
43
|
+
const reader = video.readable.getReader();
|
|
44
|
+
let current = null;
|
|
45
|
+
let nextPromise = null;
|
|
46
|
+
let ended = false;
|
|
47
|
+
const readNext = async () => {
|
|
48
|
+
if (ended)
|
|
49
|
+
return null;
|
|
50
|
+
const { done, value } = await reader.read();
|
|
51
|
+
if (done)
|
|
52
|
+
return (ended = true, null);
|
|
53
|
+
const frame = new VideoFrame(value);
|
|
54
|
+
value.close();
|
|
55
|
+
return frame;
|
|
56
|
+
};
|
|
50
57
|
return {
|
|
51
58
|
async next(targetUs) {
|
|
52
|
-
|
|
59
|
+
current ??= await readNext();
|
|
60
|
+
if (!current)
|
|
61
|
+
return undefined;
|
|
53
62
|
while (true) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
63
|
+
nextPromise ??= readNext();
|
|
64
|
+
const nextFrame = await nextPromise;
|
|
65
|
+
if (!nextFrame)
|
|
66
|
+
return new VideoFrame(current);
|
|
67
|
+
const currentUs = current.timestamp ?? -Infinity;
|
|
68
|
+
const nextUs = nextFrame.timestamp ?? currentUs;
|
|
69
|
+
if (nextUs < targetUs) {
|
|
70
|
+
current.close();
|
|
71
|
+
current = nextFrame;
|
|
72
|
+
nextPromise = null;
|
|
73
|
+
continue;
|
|
59
74
|
}
|
|
60
|
-
const
|
|
61
|
-
if (
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
const copy = new VideoFrame(chosen);
|
|
67
|
-
chosen.close();
|
|
68
|
-
other?.close();
|
|
69
|
-
return copy;
|
|
75
|
+
const useNext = Math.abs(nextUs - targetUs) < Math.abs(currentUs - targetUs);
|
|
76
|
+
if (useNext) {
|
|
77
|
+
current.close();
|
|
78
|
+
current = nextFrame;
|
|
79
|
+
nextPromise = null;
|
|
80
|
+
continue;
|
|
70
81
|
}
|
|
71
|
-
|
|
72
|
-
prev = hit;
|
|
82
|
+
return new VideoFrame(current);
|
|
73
83
|
}
|
|
74
84
|
},
|
|
75
|
-
|
|
85
|
+
async cancel() {
|
|
86
|
+
const pending = nextPromise;
|
|
87
|
+
nextPromise = null;
|
|
88
|
+
current?.close();
|
|
89
|
+
current = null;
|
|
90
|
+
video.cancel();
|
|
91
|
+
const buffered = await pending?.catch(() => null);
|
|
92
|
+
buffered?.close();
|
|
93
|
+
}
|
|
76
94
|
};
|
|
77
95
|
}
|
|
78
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../../../s/timeline/renderers/export/parts/cursor.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,EAAE,EAAK,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../../../s/timeline/renderers/export/parts/cursor.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,13 +4,12 @@ import { computeItemDuration } from "../../parts/handy.js";
|
|
|
4
4
|
export function produceVideo({ timeline, fps, driver, resolveMedia, }) {
|
|
5
5
|
const stream = new TransformStream();
|
|
6
6
|
const writer = stream.writable.getWriter();
|
|
7
|
-
const sampler = new CursorVisualSampler(driver, resolveMedia);
|
|
8
|
-
const cursor = sampler.cursor(timeline);
|
|
7
|
+
const sampler = new CursorVisualSampler(driver, resolveMedia, timeline);
|
|
9
8
|
const dt = 1 / fps;
|
|
10
9
|
const duration = computeItemDuration(timeline.rootId, timeline);
|
|
11
10
|
async function produce() {
|
|
12
11
|
await fixedStep({ fps, duration }, async (timecode, i) => {
|
|
13
|
-
const layers = await
|
|
12
|
+
const layers = await sampler.next(timecode);
|
|
14
13
|
const composed = await driver.composite(layers);
|
|
15
14
|
const frame = new VideoFrame(composed, {
|
|
16
15
|
timestamp: Math.round(i * dt * 1_000_000),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"produce-video.js","sourceRoot":"","sources":["../../../../../s/timeline/renderers/export/parts/produce-video.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,mBAAmB,EAAC,MAAM,aAAa,CAAA;AAE/C,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAA;AAEnD,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAA;AAGxD,MAAM,UAAU,YAAY,CAAC,EAC5B,QAAQ,EACR,GAAG,EACH,MAAM,EACN,YAAY,GAMZ;IAEA,MAAM,MAAM,GAAG,IAAI,eAAe,EAA0B,CAAA;IAC5D,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAA;IAC1C,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"produce-video.js","sourceRoot":"","sources":["../../../../../s/timeline/renderers/export/parts/produce-video.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,mBAAmB,EAAC,MAAM,aAAa,CAAA;AAE/C,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAA;AAEnD,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAA;AAGxD,MAAM,UAAU,YAAY,CAAC,EAC5B,QAAQ,EACR,GAAG,EACH,MAAM,EACN,YAAY,GAMZ;IAEA,MAAM,MAAM,GAAG,IAAI,eAAe,EAA0B,CAAA;IAC5D,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAA;IAC1C,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAA;IACvE,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,CAAA;IAClB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAE/D,KAAK,UAAU,OAAO;QACrB,MAAM,SAAS,CAAC,EAAC,GAAG,EAAE,QAAQ,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE;YACtD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC3C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;YAE/C,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE;gBACtC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBACzC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,SAAS,CAAC;aACpC,CAAC,CAAA;YAEF,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACzB,QAAQ,CAAC,KAAK,EAAE,CAAA;QACjB,CAAC,CAAC,CAAA;QAEF,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;IACrB,CAAC;IAED,OAAO,EAAE,CAAA;IAET,OAAO,MAAM,CAAC,QAAQ,CAAA;AACvB,CAAC"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { Fps } from '../../../../units/fps.js';
|
|
2
2
|
import { Ms } from '../../../../units/ms.js';
|
|
3
|
+
import { Driver } from '../../../../driver/driver.js';
|
|
3
4
|
import { TimelineFile } from '../../../parts/basics.js';
|
|
5
|
+
import { CursorVisualSampler } from '../../export/parts/cursor.js';
|
|
4
6
|
import { DecoderSource } from '../../../../driver/fns/schematic.js';
|
|
5
7
|
export declare class Playback {
|
|
6
8
|
#private;
|
|
9
|
+
private driver;
|
|
7
10
|
private timeline;
|
|
8
11
|
private resolveMedia;
|
|
9
|
-
visualSampler: {
|
|
10
|
-
sample(timeline: TimelineFile, timecode: Ms): Promise<import("../../../../driver/fns/schematic.js").Layer[]>;
|
|
11
|
-
};
|
|
12
12
|
audioSampler: {
|
|
13
13
|
sampleAudio(timeline: TimelineFile, from: Ms): AsyncGenerator<{
|
|
14
14
|
sample: import("mediabunny").AudioSample;
|
|
@@ -16,15 +16,19 @@ export declare class Playback {
|
|
|
16
16
|
gain: number;
|
|
17
17
|
}, void, unknown>;
|
|
18
18
|
};
|
|
19
|
+
seekVisualSampler: {
|
|
20
|
+
sample(timeline: TimelineFile, timecode: Ms): Promise<import("../../../../driver/fns/schematic.js").Layer[]>;
|
|
21
|
+
};
|
|
22
|
+
playVisualSampler: CursorVisualSampler | null;
|
|
19
23
|
onTick: import("@e280/stz").Pub<[]>;
|
|
20
24
|
audioContext: AudioContext;
|
|
21
25
|
audioGain: GainNode;
|
|
22
26
|
audioNodes: Set<AudioBufferSourceNode>;
|
|
23
|
-
constructor(timeline: TimelineFile, resolveMedia: (hash: string) => DecoderSource);
|
|
24
|
-
samples(): AsyncGenerator<import("../../../../driver/fns/schematic.js").Layer[], void, unknown>;
|
|
27
|
+
constructor(driver: Driver, timeline: TimelineFile, resolveMedia: (hash: string) => DecoderSource);
|
|
25
28
|
seek(time: Ms): Promise<import("../../../../driver/fns/schematic.js").Layer[]>;
|
|
26
29
|
start(timeline: TimelineFile): Promise<void>;
|
|
27
30
|
pause(): void;
|
|
31
|
+
get duration(): Ms;
|
|
28
32
|
get currentTime(): Ms;
|
|
29
33
|
setFps(fps: Fps): void;
|
|
30
34
|
}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
import { ms } from '../../../../units/ms.js';
|
|
2
2
|
import { realtime } from '../../parts/schedulers.js';
|
|
3
|
+
import { computeItemDuration } from '../../parts/handy.js';
|
|
3
4
|
import { seconds } from '../../../../units/seconds.js';
|
|
5
|
+
import { CursorVisualSampler } from '../../export/parts/cursor.js';
|
|
4
6
|
import { createAudioSampler } from '../../parts/samplers/audio/sampler.js';
|
|
5
7
|
import { createVisualSampler } from '../../parts/samplers/visual/sampler.js';
|
|
6
8
|
export class Playback {
|
|
9
|
+
driver;
|
|
7
10
|
timeline;
|
|
8
11
|
resolveMedia;
|
|
9
|
-
visualSampler;
|
|
10
12
|
audioSampler;
|
|
13
|
+
seekVisualSampler;
|
|
14
|
+
playVisualSampler = null;
|
|
11
15
|
#playbackStart = ms(0);
|
|
12
16
|
#audioStartSec = null;
|
|
13
17
|
#controller = realtime();
|
|
@@ -16,25 +20,33 @@ export class Playback {
|
|
|
16
20
|
audioGain = this.audioContext.createGain();
|
|
17
21
|
audioNodes = new Set();
|
|
18
22
|
#audioAbort = null;
|
|
19
|
-
constructor(timeline, resolveMedia) {
|
|
23
|
+
constructor(driver, timeline, resolveMedia) {
|
|
24
|
+
this.driver = driver;
|
|
20
25
|
this.timeline = timeline;
|
|
21
26
|
this.resolveMedia = resolveMedia;
|
|
22
27
|
this.audioGain.connect(this.audioContext.destination);
|
|
23
28
|
this.audioGain.gain.value = 0.7 ** 2;
|
|
24
|
-
this.
|
|
29
|
+
this.seekVisualSampler = createVisualSampler(this.resolveMedia);
|
|
25
30
|
this.audioSampler = createAudioSampler(this.resolveMedia);
|
|
31
|
+
this.#samples();
|
|
26
32
|
}
|
|
27
|
-
async
|
|
33
|
+
async #samples() {
|
|
28
34
|
for await (const _ of this.#controller.ticks()) {
|
|
29
|
-
|
|
35
|
+
const layers = await this.playVisualSampler?.next(this.currentTime) ?? [];
|
|
36
|
+
const frame = await this.driver.composite(layers);
|
|
37
|
+
frame.close();
|
|
38
|
+
if (this.currentTime >= this.duration)
|
|
39
|
+
this.pause();
|
|
30
40
|
}
|
|
31
41
|
}
|
|
32
42
|
async seek(time) {
|
|
33
43
|
this.pause();
|
|
34
44
|
this.#playbackStart = time;
|
|
35
|
-
return await this.
|
|
45
|
+
return await this.seekVisualSampler.sample(this.timeline, time);
|
|
36
46
|
}
|
|
37
47
|
async start(timeline) {
|
|
48
|
+
if (this.#controller.isPlaying())
|
|
49
|
+
return;
|
|
38
50
|
this.timeline = timeline;
|
|
39
51
|
await this.audioContext.resume();
|
|
40
52
|
this.#playbackStart = this.currentTime;
|
|
@@ -44,6 +56,8 @@ export class Playback {
|
|
|
44
56
|
for (const node of this.audioNodes)
|
|
45
57
|
node.stop();
|
|
46
58
|
this.audioNodes.clear();
|
|
59
|
+
this.playVisualSampler?.cancel();
|
|
60
|
+
this.playVisualSampler = new CursorVisualSampler(this.driver, this.resolveMedia, this.timeline);
|
|
47
61
|
this.#controller.play();
|
|
48
62
|
this.#startAudio(this.#audioAbort.signal, seconds(this.#playbackStart / 1000));
|
|
49
63
|
}
|
|
@@ -54,6 +68,11 @@ export class Playback {
|
|
|
54
68
|
for (const node of this.audioNodes)
|
|
55
69
|
node.stop();
|
|
56
70
|
this.audioNodes.clear();
|
|
71
|
+
this.playVisualSampler?.cancel();
|
|
72
|
+
this.playVisualSampler = null;
|
|
73
|
+
}
|
|
74
|
+
get duration() {
|
|
75
|
+
return computeItemDuration(this.timeline.rootId, this.timeline);
|
|
57
76
|
}
|
|
58
77
|
get currentTime() {
|
|
59
78
|
if (!this.#controller.isPlaying() || this.#audioStartSec === null)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playback.js","sourceRoot":"","sources":["../../../../../s/timeline/renderers/player/parts/playback.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"playback.js","sourceRoot":"","sources":["../../../../../s/timeline/renderers/player/parts/playback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { ms } from "../../../units/ms.js";
|
|
2
2
|
import { fps } from "../../../units/fps.js";
|
|
3
3
|
import { Playback } from "./parts/playback.js";
|
|
4
|
-
import { computeItemDuration } from "../parts/handy.js";
|
|
5
4
|
export class VideoPlayer {
|
|
6
5
|
driver;
|
|
7
6
|
timeline;
|
|
@@ -10,17 +9,11 @@ export class VideoPlayer {
|
|
|
10
9
|
constructor(driver, resolveMedia, timeline) {
|
|
11
10
|
this.driver = driver;
|
|
12
11
|
this.timeline = timeline;
|
|
13
|
-
this.playback = new Playback(timeline, resolveMedia);
|
|
12
|
+
this.playback = new Playback(driver, timeline, resolveMedia);
|
|
14
13
|
this.canvas = driver.compositor.pixi.renderer.canvas;
|
|
15
14
|
}
|
|
16
15
|
async play() {
|
|
17
16
|
await this.playback.start(this.timeline);
|
|
18
|
-
for await (const layers of this.playback.samples()) {
|
|
19
|
-
const frame = await this.driver.composite(layers);
|
|
20
|
-
frame.close();
|
|
21
|
-
if (this.currentTime >= this.duration)
|
|
22
|
-
this.pause();
|
|
23
|
-
}
|
|
24
17
|
}
|
|
25
18
|
pause() {
|
|
26
19
|
this.playback.pause();
|
|
@@ -34,7 +27,7 @@ export class VideoPlayer {
|
|
|
34
27
|
this.playback.setFps(fps(value));
|
|
35
28
|
}
|
|
36
29
|
get duration() {
|
|
37
|
-
return
|
|
30
|
+
return this.playback.duration;
|
|
38
31
|
}
|
|
39
32
|
get currentTime() {
|
|
40
33
|
return this.playback.currentTime;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"player.js","sourceRoot":"","sources":["../../../../s/timeline/renderers/player/player.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,EAAE,EAAC,MAAM,sBAAsB,CAAA;AACvC,OAAO,EAAC,GAAG,EAAC,MAAM,uBAAuB,CAAA;AACzC,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"player.js","sourceRoot":"","sources":["../../../../s/timeline/renderers/player/player.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,EAAE,EAAC,MAAM,sBAAsB,CAAA;AACvC,OAAO,EAAC,GAAG,EAAC,MAAM,uBAAuB,CAAA;AACzC,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAA;AAO5C,MAAM,OAAO,WAAW;IAKd;IAEA;IANT,MAAM,CAAmB;IACzB,QAAQ,CAAU;IAElB,YACS,MAAc,EACtB,YAA0B,EAClB,QAAsB;QAFtB,WAAM,GAAN,MAAM,CAAQ;QAEd,aAAQ,GAAR,QAAQ,CAAc;QAE9B,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAA;QAC5D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,IAAI;QACT,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACzC,CAAC;IAED,KAAK;QACJ,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAc;QACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;QACnD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QACjD,KAAK,CAAC,KAAK,EAAE,CAAA;IACd,CAAC;IAED,MAAM,CAAC,KAAa;QACnB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;IACjC,CAAC;IAED,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAA;IAC9B,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAA;IACjC,CAAC;IAED;;MAEE;IACF,KAAK,CAAC,MAAM,CAAC,QAAsB;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IACzB,CAAC;CAED;AAED,MAAM,KAAK,GAAG,CAAC,GAAkB,EAAE,EAAE,CAAC,CAAC,GAAG,YAAY,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA"}
|
|
@@ -33,8 +33,7 @@ export default Science.suite({
|
|
|
33
33
|
"cursor visual sampler cannot get previous samples": test(async () => {
|
|
34
34
|
const { omni, videoA, resolveMedia, driver } = await setupTest();
|
|
35
35
|
const { timeline } = new O({ timeline: omni.timeline(o => o.sequence(o.video(videoA, { duration: 2000 }), o.gap(500), o.video(videoA, { duration: 2000 }), o.audio(videoA, { duration: 500 }))) });
|
|
36
|
-
const
|
|
37
|
-
const cursor = sampler.cursor(timeline);
|
|
36
|
+
const cursor = new CursorVisualSampler(driver, resolveMedia, timeline);
|
|
38
37
|
await cursor.next(ms(1000));
|
|
39
38
|
await expect(async () => await cursor.next(ms(100))).throwsAsync();
|
|
40
39
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderers.test.js","sourceRoot":"","sources":["../../../s/timeline/renderers/renderers.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"renderers.test.js","sourceRoot":"","sources":["../../../s/timeline/renderers/renderers.test.ts"],"names":[],"mappings":"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"}
|
package/x/timeline/sugar/o.d.ts
CHANGED
|
@@ -13,6 +13,7 @@ export declare class O {
|
|
|
13
13
|
});
|
|
14
14
|
require<T extends Item.Any>(id: Id | undefined): T | undefined;
|
|
15
15
|
get timeline(): TimelineFile;
|
|
16
|
+
getId(): number;
|
|
16
17
|
register(item: Item.Any): void;
|
|
17
18
|
textStyle: (style: TextStyleOptions) => Item.TextStyle;
|
|
18
19
|
spatial: (transform: Transform) => Item.Spatial;
|
package/x/timeline/sugar/o.js
CHANGED
|
@@ -14,7 +14,7 @@ export class O {
|
|
|
14
14
|
get timeline() {
|
|
15
15
|
return this.state.timeline;
|
|
16
16
|
}
|
|
17
|
-
|
|
17
|
+
getId() {
|
|
18
18
|
return hex.toInteger(hex.random());
|
|
19
19
|
}
|
|
20
20
|
#mutate(fn) {
|
|
@@ -28,7 +28,7 @@ export class O {
|
|
|
28
28
|
}
|
|
29
29
|
textStyle = (style) => {
|
|
30
30
|
const item = {
|
|
31
|
-
id: this
|
|
31
|
+
id: this.getId(),
|
|
32
32
|
kind: Kind.TextStyle,
|
|
33
33
|
style
|
|
34
34
|
};
|
|
@@ -37,7 +37,7 @@ export class O {
|
|
|
37
37
|
};
|
|
38
38
|
spatial = (transform) => {
|
|
39
39
|
const item = {
|
|
40
|
-
id: this
|
|
40
|
+
id: this.getId(),
|
|
41
41
|
kind: Kind.Spatial,
|
|
42
42
|
transform,
|
|
43
43
|
enabled: true
|
|
@@ -47,7 +47,7 @@ export class O {
|
|
|
47
47
|
};
|
|
48
48
|
sequence = (...items) => {
|
|
49
49
|
const item = {
|
|
50
|
-
id: this
|
|
50
|
+
id: this.getId(),
|
|
51
51
|
kind: Kind.Sequence,
|
|
52
52
|
childrenIds: items.map(item => item.id)
|
|
53
53
|
};
|
|
@@ -57,7 +57,7 @@ export class O {
|
|
|
57
57
|
stack = (...items) => {
|
|
58
58
|
const item = {
|
|
59
59
|
kind: Kind.Stack,
|
|
60
|
-
id: this
|
|
60
|
+
id: this.getId(),
|
|
61
61
|
childrenIds: items.map(item => item.id)
|
|
62
62
|
};
|
|
63
63
|
this.register(item);
|
|
@@ -68,7 +68,7 @@ export class O {
|
|
|
68
68
|
throw new Error(`Video clip error: media "${media.datafile.filename}" has no video track.`);
|
|
69
69
|
const item = {
|
|
70
70
|
kind: Kind.Video,
|
|
71
|
-
id: this
|
|
71
|
+
id: this.getId(),
|
|
72
72
|
mediaHash: media.datafile.checksum.hash,
|
|
73
73
|
start: options?.start ?? 0,
|
|
74
74
|
duration: options?.duration ?? media.duration
|
|
@@ -81,7 +81,7 @@ export class O {
|
|
|
81
81
|
throw new Error(`Audio clip error: media "${media.datafile.filename}" has no audio track.`);
|
|
82
82
|
const item = {
|
|
83
83
|
kind: Kind.Audio,
|
|
84
|
-
id: this
|
|
84
|
+
id: this.getId(),
|
|
85
85
|
mediaHash: media.datafile.checksum.hash,
|
|
86
86
|
start: options?.start ?? 0,
|
|
87
87
|
duration: options?.duration ?? media.duration,
|
|
@@ -92,7 +92,7 @@ export class O {
|
|
|
92
92
|
};
|
|
93
93
|
text = (content, options) => {
|
|
94
94
|
const item = {
|
|
95
|
-
id: this
|
|
95
|
+
id: this.getId(),
|
|
96
96
|
content,
|
|
97
97
|
kind: Kind.Text,
|
|
98
98
|
duration: options?.duration ?? 2000
|
|
@@ -104,7 +104,7 @@ export class O {
|
|
|
104
104
|
};
|
|
105
105
|
gap = (duration) => {
|
|
106
106
|
const item = {
|
|
107
|
-
id: this
|
|
107
|
+
id: this.getId(),
|
|
108
108
|
kind: Kind.Gap,
|
|
109
109
|
duration
|
|
110
110
|
};
|
|
@@ -114,7 +114,7 @@ export class O {
|
|
|
114
114
|
transition = {
|
|
115
115
|
crossfade: (duration) => {
|
|
116
116
|
const item = {
|
|
117
|
-
id: this
|
|
117
|
+
id: this.getId(),
|
|
118
118
|
kind: Kind.Transition,
|
|
119
119
|
effect: Effect.Crossfade,
|
|
120
120
|
duration,
|