@omnimedia/omnitool 1.1.0-4 → 1.1.0-41

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.
Files changed (183) hide show
  1. package/package.json +8 -4
  2. package/s/context.ts +0 -7
  3. package/s/demo/demo.bundle.ts +35 -5
  4. package/s/demo/demo.css +5 -0
  5. package/s/demo/routines/transcode-test.ts +8 -4
  6. package/s/demo/routines/transitions-test.ts +43 -0
  7. package/s/demo/routines/waveform-test.ts +3 -2
  8. package/s/driver/driver.ts +19 -11
  9. package/s/driver/fns/schematic.ts +46 -23
  10. package/s/driver/fns/work.ts +114 -102
  11. package/s/features/transition/parts/fragment.ts +24 -0
  12. package/s/features/transition/parts/types.ts +94 -0
  13. package/s/features/transition/parts/uniforms.ts +29 -0
  14. package/s/features/transition/parts/vertex.ts +31 -0
  15. package/s/features/transition/transition.ts +60 -0
  16. package/s/index.html.ts +6 -1
  17. package/s/timeline/index.ts +2 -0
  18. package/s/timeline/parts/basics.ts +1 -1
  19. package/s/timeline/parts/compositor/export.ts +77 -0
  20. package/s/timeline/parts/compositor/parts/html-tree.ts +37 -0
  21. package/s/timeline/parts/compositor/parts/schedulers.ts +95 -0
  22. package/s/timeline/parts/compositor/parts/tree-builder.ts +196 -0
  23. package/s/timeline/parts/compositor/parts/webcodecs-tree.ts +30 -0
  24. package/s/timeline/parts/compositor/playback.ts +94 -0
  25. package/s/timeline/parts/compositor/samplers/html.ts +115 -0
  26. package/s/timeline/parts/compositor/samplers/webcodecs.ts +61 -0
  27. package/s/timeline/parts/filmstrip.ts +42 -15
  28. package/s/timeline/parts/item.ts +48 -6
  29. package/s/timeline/parts/media.ts +21 -0
  30. package/s/timeline/parts/waveform.ts +3 -4
  31. package/s/timeline/sugar/builders.ts +102 -0
  32. package/s/timeline/sugar/o.ts +163 -38
  33. package/s/timeline/sugar/omni-test.ts +5 -3
  34. package/s/timeline/sugar/omni.ts +26 -11
  35. package/s/timeline/types.ts +29 -0
  36. package/s/timeline/utils/audio-stream.ts +15 -0
  37. package/s/timeline/utils/matrix.ts +33 -0
  38. package/s/timeline/utils/video-cursor.ts +40 -0
  39. package/x/context.d.ts +1 -4
  40. package/x/context.js +1 -5
  41. package/x/context.js.map +1 -1
  42. package/x/demo/demo.bundle.js +23 -6
  43. package/x/demo/demo.bundle.js.map +1 -1
  44. package/x/demo/demo.bundle.min.js +606 -36
  45. package/x/demo/demo.bundle.min.js.map +4 -4
  46. package/x/demo/demo.css +5 -0
  47. package/x/demo/routines/transcode-test.js +8 -4
  48. package/x/demo/routines/transcode-test.js.map +1 -1
  49. package/x/demo/routines/transitions-test.d.ts +5 -0
  50. package/x/demo/routines/transitions-test.js +35 -0
  51. package/x/demo/routines/transitions-test.js.map +1 -0
  52. package/x/demo/routines/waveform-test.d.ts +2 -1
  53. package/x/demo/routines/waveform-test.js +2 -2
  54. package/x/demo/routines/waveform-test.js.map +1 -1
  55. package/x/driver/driver.d.ts +4 -6
  56. package/x/driver/driver.js +17 -10
  57. package/x/driver/driver.js.map +1 -1
  58. package/x/driver/driver.worker.bundle.min.js +2537 -148
  59. package/x/driver/driver.worker.bundle.min.js.map +4 -4
  60. package/x/driver/fns/host.d.ts +9 -2
  61. package/x/driver/fns/schematic.d.ts +40 -22
  62. package/x/driver/fns/work.d.ts +11 -4
  63. package/x/driver/fns/work.js +107 -101
  64. package/x/driver/fns/work.js.map +1 -1
  65. package/x/features/speech/transcribe/worker.bundle.min.js +542 -542
  66. package/x/features/speech/transcribe/worker.bundle.min.js.map +4 -4
  67. package/x/features/transition/parts/fragment.d.ts +1 -0
  68. package/x/features/transition/parts/fragment.js +25 -0
  69. package/x/features/transition/parts/fragment.js.map +1 -0
  70. package/x/features/transition/parts/types.d.ts +23 -0
  71. package/x/features/transition/parts/types.js.map +1 -0
  72. package/x/features/transition/parts/uniforms.d.ts +31 -0
  73. package/x/features/transition/parts/uniforms.js +27 -0
  74. package/x/features/transition/parts/uniforms.js.map +1 -0
  75. package/x/features/transition/parts/vertex.d.ts +1 -0
  76. package/x/features/transition/parts/vertex.js +32 -0
  77. package/x/features/transition/parts/vertex.js.map +1 -0
  78. package/x/features/transition/transition.d.ts +5 -0
  79. package/x/features/transition/transition.js +50 -0
  80. package/x/features/transition/transition.js.map +1 -0
  81. package/x/index.html +13 -3
  82. package/x/index.html.js +6 -1
  83. package/x/index.html.js.map +1 -1
  84. package/x/timeline/index.d.ts +2 -0
  85. package/x/timeline/index.js +2 -0
  86. package/x/timeline/index.js.map +1 -1
  87. package/x/timeline/parts/basics.d.ts +1 -1
  88. package/x/timeline/parts/compositor/export.d.ts +11 -0
  89. package/x/timeline/parts/compositor/export.js +64 -0
  90. package/x/timeline/parts/compositor/export.js.map +1 -0
  91. package/x/timeline/parts/compositor/parts/html-tree.d.ts +3 -0
  92. package/x/timeline/parts/compositor/parts/html-tree.js +40 -0
  93. package/x/timeline/parts/compositor/parts/html-tree.js.map +1 -0
  94. package/x/timeline/parts/compositor/parts/schedulers.d.ts +15 -0
  95. package/x/timeline/parts/compositor/parts/schedulers.js +70 -0
  96. package/x/timeline/parts/compositor/parts/schedulers.js.map +1 -0
  97. package/x/timeline/parts/compositor/parts/tree-builder.d.ts +37 -0
  98. package/x/timeline/parts/compositor/parts/tree-builder.js +160 -0
  99. package/x/timeline/parts/compositor/parts/tree-builder.js.map +1 -0
  100. package/x/timeline/parts/compositor/parts/webcodecs-tree.d.ts +3 -0
  101. package/x/timeline/parts/compositor/parts/webcodecs-tree.js +28 -0
  102. package/x/timeline/parts/compositor/parts/webcodecs-tree.js.map +1 -0
  103. package/x/timeline/parts/compositor/playback.d.ts +26 -0
  104. package/x/timeline/parts/compositor/playback.js +79 -0
  105. package/x/timeline/parts/compositor/playback.js.map +1 -0
  106. package/x/timeline/parts/compositor/samplers/html.d.ts +3 -0
  107. package/x/timeline/parts/compositor/samplers/html.js +106 -0
  108. package/x/timeline/parts/compositor/samplers/html.js.map +1 -0
  109. package/x/timeline/parts/compositor/samplers/webcodecs.d.ts +3 -0
  110. package/x/timeline/parts/compositor/samplers/webcodecs.js +52 -0
  111. package/x/timeline/parts/compositor/samplers/webcodecs.js.map +1 -0
  112. package/x/timeline/parts/filmstrip.d.ts +2 -1
  113. package/x/timeline/parts/filmstrip.js +29 -10
  114. package/x/timeline/parts/filmstrip.js.map +1 -1
  115. package/x/timeline/parts/item.d.ts +42 -8
  116. package/x/timeline/parts/item.js +7 -3
  117. package/x/timeline/parts/item.js.map +1 -1
  118. package/x/timeline/parts/media.d.ts +3 -0
  119. package/x/timeline/parts/media.js +17 -0
  120. package/x/timeline/parts/media.js.map +1 -1
  121. package/x/timeline/parts/waveform.d.ts +2 -1
  122. package/x/timeline/parts/waveform.js +2 -4
  123. package/x/timeline/parts/waveform.js.map +1 -1
  124. package/x/timeline/sugar/builders.js +104 -0
  125. package/x/timeline/sugar/builders.js.map +1 -0
  126. package/x/timeline/sugar/o.d.ts +27 -5
  127. package/x/timeline/sugar/o.js +137 -38
  128. package/x/timeline/sugar/o.js.map +1 -1
  129. package/x/timeline/sugar/omni-test.js +4 -2
  130. package/x/timeline/sugar/omni-test.js.map +1 -1
  131. package/x/timeline/sugar/omni.d.ts +8 -2
  132. package/x/timeline/sugar/omni.js +22 -9
  133. package/x/timeline/sugar/omni.js.map +1 -1
  134. package/x/timeline/types.d.ts +24 -0
  135. package/x/timeline/types.js +2 -0
  136. package/x/timeline/types.js.map +1 -0
  137. package/x/timeline/utils/audio-stream.d.ts +6 -0
  138. package/x/timeline/utils/audio-stream.js +17 -0
  139. package/x/timeline/utils/audio-stream.js.map +1 -0
  140. package/x/timeline/utils/matrix.d.ts +8 -0
  141. package/x/timeline/utils/matrix.js +26 -0
  142. package/x/timeline/utils/matrix.js.map +1 -0
  143. package/x/timeline/utils/video-cursor.d.ts +10 -0
  144. package/x/timeline/utils/video-cursor.js +36 -0
  145. package/x/timeline/utils/video-cursor.js.map +1 -0
  146. package/s/tools/common/loader.ts +0 -26
  147. package/s/tools/common/transformer-pipeline.ts +0 -26
  148. package/s/tools/speech-recognition/common/model.ts +0 -26
  149. package/s/tools/speech-recognition/whisper/fns/host.ts +0 -25
  150. package/s/tools/speech-recognition/whisper/fns/schematic.ts +0 -23
  151. package/s/tools/speech-recognition/whisper/fns/work.ts +0 -91
  152. package/s/tools/speech-recognition/whisper/parts/types.ts +0 -38
  153. package/s/tools/speech-recognition/whisper/parts/worker.bundle.ts +0 -7
  154. package/s/tools/speech-recognition/whisper/tool.ts +0 -70
  155. package/x/tools/common/loader.d.ts +0 -19
  156. package/x/tools/common/loader.js +0 -18
  157. package/x/tools/common/loader.js.map +0 -1
  158. package/x/tools/common/transformer-pipeline.d.ts +0 -8
  159. package/x/tools/common/transformer-pipeline.js +0 -24
  160. package/x/tools/common/transformer-pipeline.js.map +0 -1
  161. package/x/tools/speech-recognition/common/model.d.ts +0 -14
  162. package/x/tools/speech-recognition/common/model.js +0 -16
  163. package/x/tools/speech-recognition/common/model.js.map +0 -1
  164. package/x/tools/speech-recognition/whisper/fns/host.d.ts +0 -13
  165. package/x/tools/speech-recognition/whisper/fns/host.js +0 -19
  166. package/x/tools/speech-recognition/whisper/fns/host.js.map +0 -1
  167. package/x/tools/speech-recognition/whisper/fns/schematic.d.ts +0 -19
  168. package/x/tools/speech-recognition/whisper/fns/schematic.js +0 -2
  169. package/x/tools/speech-recognition/whisper/fns/schematic.js.map +0 -1
  170. package/x/tools/speech-recognition/whisper/fns/work.d.ts +0 -12
  171. package/x/tools/speech-recognition/whisper/fns/work.js +0 -74
  172. package/x/tools/speech-recognition/whisper/fns/work.js.map +0 -1
  173. package/x/tools/speech-recognition/whisper/parts/types.d.ts +0 -31
  174. package/x/tools/speech-recognition/whisper/parts/types.js.map +0 -1
  175. package/x/tools/speech-recognition/whisper/parts/worker.bundle.js +0 -4
  176. package/x/tools/speech-recognition/whisper/parts/worker.bundle.js.map +0 -1
  177. package/x/tools/speech-recognition/whisper/parts/worker.bundle.min.js +0 -8
  178. package/x/tools/speech-recognition/whisper/parts/worker.bundle.min.js.map +0 -7
  179. package/x/tools/speech-recognition/whisper/tool.d.ts +0 -12
  180. package/x/tools/speech-recognition/whisper/tool.js +0 -63
  181. package/x/tools/speech-recognition/whisper/tool.js.map +0 -1
  182. /package/x/{tools/speech-recognition/whisper → features/transition}/parts/types.js +0 -0
  183. /package/x/{tools/speech-recognition/whisper/parts/worker.bundle.d.ts → timeline/sugar/builders.d.ts} +0 -0
@@ -1,28 +1,59 @@
1
+ import { TextStyleOptions } from "pixi.js";
1
2
  import { Id, Hash } from "./basics.js";
3
+ import { Transform } from "../types.js";
2
4
  export declare enum Kind {
3
5
  Sequence = 0,
4
6
  Stack = 1,
5
- Clip = 2,
6
- Text = 3,
7
- Transition = 4
7
+ Video = 2,
8
+ Audio = 3,
9
+ Text = 4,
10
+ Gap = 5,
11
+ Spatial = 6,
12
+ Transition = 7,
13
+ TextStyle = 8
8
14
  }
9
15
  export declare enum Effect {
10
16
  Crossfade = 0
11
17
  }
12
18
  export declare namespace Item {
19
+ type TextStyle = {
20
+ id: Id;
21
+ kind: Kind.TextStyle;
22
+ style: TextStyleOptions;
23
+ };
24
+ type Spatial = {
25
+ id: Id;
26
+ kind: Kind.Spatial;
27
+ transform: Transform;
28
+ };
29
+ type Gap = {
30
+ id: Id;
31
+ kind: Kind.Gap;
32
+ duration: number;
33
+ };
13
34
  type Sequence = {
14
35
  id: Id;
15
36
  kind: Kind.Sequence;
16
- children: Id[];
37
+ childrenIds: Id[];
38
+ spatialId?: Id;
17
39
  };
18
40
  type Stack = {
19
41
  id: Id;
20
42
  kind: Kind.Stack;
21
- children: Id[];
43
+ childrenIds: Id[];
44
+ spatialId?: Id;
22
45
  };
23
- type Clip = {
46
+ type Video = {
24
47
  id: Id;
25
- kind: Kind.Clip;
48
+ kind: Kind.Video;
49
+ mediaHash: Hash;
50
+ start: number;
51
+ duration: number;
52
+ spatialId?: Id;
53
+ };
54
+ type Audio = {
55
+ id: Id;
56
+ kind: Kind.Audio;
26
57
  mediaHash: Hash;
27
58
  start: number;
28
59
  duration: number;
@@ -31,6 +62,9 @@ export declare namespace Item {
31
62
  id: Id;
32
63
  kind: Kind.Text;
33
64
  content: string;
65
+ duration: number;
66
+ spatialId?: Id;
67
+ styleId?: Id;
34
68
  };
35
69
  type Transition = {
36
70
  id: Id;
@@ -38,5 +72,5 @@ export declare namespace Item {
38
72
  effect: Effect.Crossfade;
39
73
  duration: number;
40
74
  };
41
- type Any = (Sequence | Stack | Clip | Text | Transition);
75
+ type Any = (Sequence | Stack | Video | Audio | Text | Gap | Transition | Spatial | TextStyle);
42
76
  }
@@ -2,9 +2,13 @@ export var Kind;
2
2
  (function (Kind) {
3
3
  Kind[Kind["Sequence"] = 0] = "Sequence";
4
4
  Kind[Kind["Stack"] = 1] = "Stack";
5
- Kind[Kind["Clip"] = 2] = "Clip";
6
- Kind[Kind["Text"] = 3] = "Text";
7
- Kind[Kind["Transition"] = 4] = "Transition";
5
+ Kind[Kind["Video"] = 2] = "Video";
6
+ Kind[Kind["Audio"] = 3] = "Audio";
7
+ Kind[Kind["Text"] = 4] = "Text";
8
+ Kind[Kind["Gap"] = 5] = "Gap";
9
+ Kind[Kind["Spatial"] = 6] = "Spatial";
10
+ Kind[Kind["Transition"] = 7] = "Transition";
11
+ Kind[Kind["TextStyle"] = 8] = "TextStyle";
8
12
  })(Kind || (Kind = {}));
9
13
  export var Effect;
10
14
  (function (Effect) {
@@ -1 +1 @@
1
- {"version":3,"file":"item.js","sourceRoot":"","sources":["../../../s/timeline/parts/item.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,IAMX;AAND,WAAY,IAAI;IACf,uCAAQ,CAAA;IACR,iCAAK,CAAA;IACL,+BAAI,CAAA;IACJ,+BAAI,CAAA;IACJ,2CAAU,CAAA;AACX,CAAC,EANW,IAAI,KAAJ,IAAI,QAMf;AAED,MAAM,CAAN,IAAY,MAEX;AAFD,WAAY,MAAM;IACjB,6CAAS,CAAA;AACV,CAAC,EAFW,MAAM,KAAN,MAAM,QAEjB"}
1
+ {"version":3,"file":"item.js","sourceRoot":"","sources":["../../../s/timeline/parts/item.ts"],"names":[],"mappings":"AAKA,MAAM,CAAN,IAAY,IAUX;AAVD,WAAY,IAAI;IACf,uCAAQ,CAAA;IACR,iCAAK,CAAA;IACL,iCAAK,CAAA;IACL,iCAAK,CAAA;IACL,+BAAI,CAAA;IACJ,6BAAG,CAAA;IACH,qCAAO,CAAA;IACP,2CAAU,CAAA;IACV,yCAAS,CAAA;AACV,CAAC,EAVW,IAAI,KAAJ,IAAI,QAUf;AAED,MAAM,CAAN,IAAY,MAEX;AAFD,WAAY,MAAM;IACjB,6CAAS,CAAA;AACV,CAAC,EAFW,MAAM,KAAN,MAAM,QAEjB"}
@@ -1,7 +1,10 @@
1
1
  import { Datafile } from "../utils/datafile.js";
2
2
  export declare class Media {
3
+ #private;
3
4
  datafile: Datafile;
4
5
  duration: number;
6
+ hasVideo: boolean;
7
+ hasAudio: boolean;
5
8
  constructor(datafile: Datafile);
6
9
  static analyze(datafile: Datafile): Promise<Media>;
7
10
  }
@@ -1,13 +1,30 @@
1
+ import { ALL_FORMATS, Input } from "mediabunny";
2
+ import { loadDecoderSource } from "../../driver/utils/load-decoder-source.js";
1
3
  export class Media {
2
4
  datafile;
3
5
  duration = 0;
6
+ hasVideo = false;
7
+ hasAudio = false;
4
8
  constructor(datafile) {
5
9
  this.datafile = datafile;
6
10
  }
7
11
  static async analyze(datafile) {
8
12
  const media = new this(datafile);
9
13
  media.duration = 10;
14
+ const { video, audio } = await this.#has("/assets/temp/gl.mp4");
15
+ media.hasAudio = audio;
16
+ media.hasVideo = video;
10
17
  return media;
11
18
  }
19
+ static async #has(source) {
20
+ const input = new Input({
21
+ formats: ALL_FORMATS,
22
+ source: await loadDecoderSource(source)
23
+ });
24
+ return {
25
+ audio: !!(await input.getPrimaryAudioTrack()),
26
+ video: !!(await input.getPrimaryVideoTrack())
27
+ };
28
+ }
12
29
  }
13
30
  //# sourceMappingURL=media.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"media.js","sourceRoot":"","sources":["../../../s/timeline/parts/media.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,KAAK;IAEE;IADnB,QAAQ,GAAG,CAAC,CAAA;IACZ,YAAmB,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;IAAG,CAAC;IAEzC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAkB;QACtC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAA;QAChC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAA;QACnB,OAAO,KAAK,CAAA;IACb,CAAC;CACD"}
1
+ {"version":3,"file":"media.js","sourceRoot":"","sources":["../../../s/timeline/parts/media.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAE,KAAK,EAAC,MAAM,YAAY,CAAA;AAI7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,2CAA2C,CAAA;AAE3E,MAAM,OAAO,KAAK;IAKE;IAJnB,QAAQ,GAAG,CAAC,CAAA;IACZ,QAAQ,GAAG,KAAK,CAAA;IAChB,QAAQ,GAAG,KAAK,CAAA;IAEhB,YAAmB,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;IAAG,CAAC;IAEzC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAkB;QACtC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAA;QAChC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAA;QACnB,MAAM,EAAC,KAAK,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;QAC7D,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAA;QACtB,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAA;QACtB,OAAO,KAAK,CAAA;IACb,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAqB;QACtC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;YACvB,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,MAAM,iBAAiB,CAAC,MAAM,CAAC;SACvC,CAAC,CAAA;QACF,OAAO;YACN,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,oBAAoB,EAAE,CAAC;YAC7C,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,oBAAoB,EAAE,CAAC;SAC7C,CAAA;IACF,CAAC;CACD"}
@@ -1,8 +1,9 @@
1
1
  import WaveSurfer from "wavesurfer.js";
2
+ import { Driver } from "../../driver/driver.js";
2
3
  import { DecoderSource } from "../../driver/fns/schematic.js";
3
4
  export declare class Waveform {
4
5
  wavesurfer: WaveSurfer;
5
6
  constructor(peaks: number[], container: HTMLElement, duration: number);
6
- static init(source: DecoderSource, container: HTMLElement): Promise<Waveform>;
7
+ static init(driver: Driver, source: DecoderSource, container: HTMLElement): Promise<Waveform>;
7
8
  set width(value: number);
8
9
  }
@@ -1,5 +1,4 @@
1
1
  import WaveSurfer from "wavesurfer.js";
2
- import { context } from "../../context.js";
3
2
  export class Waveform {
4
3
  wavesurfer;
5
4
  constructor(peaks, container, duration) {
@@ -14,9 +13,8 @@ export class Waveform {
14
13
  duration
15
14
  });
16
15
  }
17
- static async init(source, container) {
18
- const driver = await context.driver;
19
- const reader = driver.decode({ source }).audio.getReader();
16
+ static async init(driver, source, container) {
17
+ const reader = driver.decodeAudio({ source }).getReader();
20
18
  const peaks = [];
21
19
  let buffer = [];
22
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;AAEtC,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAA;AAGxC,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,MAAqB,EAAE,SAAsB;QAC9D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAA;QACnC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,CAAA;QAE1D,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"}
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;QAEvD,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"}
@@ -0,0 +1,104 @@
1
+ export {};
2
+ // import {O} from "./o.js"
3
+ // import {Id} from "../parts/basics.js"
4
+ // import {Item} from "../parts/item.js"
5
+ //
6
+ // export class TimelineItem {
7
+ // public readonly id: Id
8
+ //
9
+ // constructor(public item: Item.Any) {
10
+ // this.id = item.id
11
+ // }
12
+ //
13
+ // toJSON() {
14
+ // return {
15
+ // ...this.item
16
+ // }
17
+ // }
18
+ // }
19
+ //
20
+ // abstract class VisualItem extends TimelineItem {
21
+ // abstract spatial(spatial: Spatial): TimelineItem
22
+ // }
23
+ //
24
+ // export class Stack extends VisualItem {
25
+ // constructor(private o: O, public item: Item.Stack) {
26
+ // super(item)
27
+ // }
28
+ //
29
+ // spatial(spatial: Spatial) {
30
+ // this.item.spatialId = spatial.item.id
31
+ // return this
32
+ // }
33
+ //
34
+ // addChildren(fn: (o: O) => TimelineItem | TimelineItem[]) {
35
+ // const result = fn(this.o)
36
+ // const items = Array.isArray(result) ? result : [result]
37
+ // this.item.childrenIds.push(...items.map(c => c.item.id))
38
+ // return this
39
+ // }
40
+ // }
41
+ //
42
+ // export class Spatial extends TimelineItem {
43
+ // constructor(public item: Item.Spatial) {super(item)}
44
+ // }
45
+ //
46
+ // export class Gap extends TimelineItem {
47
+ // constructor(public item: Item.Gap) {super(item)}
48
+ // }
49
+ //
50
+ // export class Audio extends TimelineItem {
51
+ // constructor(public item: Item.Audio) {super(item)}
52
+ // }
53
+ //
54
+ // export class Video extends VisualItem {
55
+ // constructor(public item: Item.Video) {
56
+ // super(item)
57
+ // }
58
+ //
59
+ // spatial(spatial: Spatial) {
60
+ // this.item.spatialId = spatial.item.id
61
+ // return this
62
+ // }
63
+ // }
64
+ //
65
+ // export class Text extends VisualItem {
66
+ // constructor(public item: Item.Text) {
67
+ // super(item)
68
+ // }
69
+ //
70
+ // color(color: string) {
71
+ // this.item.color = color
72
+ // return this
73
+ // }
74
+ //
75
+ // spatial(spatial: Spatial) {
76
+ // this.item.spatialId = spatial.item.id
77
+ // return this
78
+ // }
79
+ // }
80
+ //
81
+ // export class Sequence extends VisualItem {
82
+ // constructor(private o: O, public item: Item.Sequence) {
83
+ // super(item)
84
+ // }
85
+ //
86
+ // spatial(spatial: Spatial) {
87
+ // this.item.spatialId = spatial.item.id
88
+ // return this
89
+ // }
90
+ //
91
+ // addChildren(fn: (o: O) => TimelineItem | TimelineItem[]) {
92
+ // const result = fn(this.o)
93
+ // const items = Array.isArray(result) ? result : [result]
94
+ // this.item.childrenIds.push(...items.map(c => c.item.id))
95
+ // return this
96
+ // }
97
+ // }
98
+ //
99
+ // export class Transition extends TimelineItem {
100
+ // constructor(public item: Item.Transition) {
101
+ // super(item)
102
+ // }
103
+ // }
104
+ //# sourceMappingURL=builders.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"builders.js","sourceRoot":"","sources":["../../../s/timeline/sugar/builders.ts"],"names":[],"mappings":";AAAA,2BAA2B;AAC3B,wCAAwC;AACxC,wCAAwC;AACxC,EAAE;AACF,8BAA8B;AAC9B,0BAA0B;AAC1B,EAAE;AACF,wCAAwC;AACxC,sBAAsB;AACtB,KAAK;AACL,EAAE;AACF,cAAc;AACd,aAAa;AACb,kBAAkB;AAClB,MAAM;AACN,KAAK;AACL,IAAI;AACJ,EAAE;AACF,mDAAmD;AACnD,qDAAqD;AACrD,IAAI;AACJ,EAAE;AACF,0CAA0C;AAC1C,yDAAyD;AACzD,iBAAiB;AACjB,MAAM;AACN,EAAE;AACF,gCAAgC;AAChC,2CAA2C;AAC3C,kBAAkB;AAClB,MAAM;AACN,EAAE;AACF,+DAA+D;AAC/D,+BAA+B;AAC/B,6DAA6D;AAC7D,+DAA+D;AAC/D,kBAAkB;AAClB,MAAM;AACN,IAAI;AACJ,EAAE;AACF,8CAA8C;AAC9C,wDAAwD;AACxD,IAAI;AACJ,EAAE;AACF,0CAA0C;AAC1C,oDAAoD;AACpD,IAAI;AACJ,EAAE;AACF,4CAA4C;AAC5C,sDAAsD;AACtD,IAAI;AACJ,EAAE;AACF,0CAA0C;AAC1C,2CAA2C;AAC3C,iBAAiB;AACjB,MAAM;AACN,EAAE;AACF,gCAAgC;AAChC,2CAA2C;AAC3C,kBAAkB;AAClB,MAAM;AACN,IAAI;AACJ,EAAE;AACF,yCAAyC;AACzC,0CAA0C;AAC1C,iBAAiB;AACjB,MAAM;AACN,EAAE;AACF,2BAA2B;AAC3B,6BAA6B;AAC7B,gBAAgB;AAChB,MAAM;AACN,EAAE;AACF,gCAAgC;AAChC,2CAA2C;AAC3C,kBAAkB;AAClB,MAAM;AACN,IAAI;AACJ,EAAE;AACF,6CAA6C;AAC7C,2DAA2D;AAC3D,gBAAgB;AAChB,KAAK;AACL,EAAE;AACF,gCAAgC;AAChC,2CAA2C;AAC3C,kBAAkB;AAClB,MAAM;AACN,EAAE;AACF,+DAA+D;AAC/D,+BAA+B;AAC/B,6DAA6D;AAC7D,+DAA+D;AAC/D,kBAAkB;AAClB,MAAM;AACN,IAAI;AACJ,EAAE;AACF,iDAAiD;AACjD,+CAA+C;AAC/C,gBAAgB;AAChB,KAAK;AACL,IAAI"}
@@ -1,14 +1,36 @@
1
+ import { TextStyleOptions } from "pixi.js";
1
2
  import { Media } from "../parts/media.js";
3
+ import { Id, TimelineFile } from "../parts/basics.js";
2
4
  import { Item } from "../parts/item.js";
5
+ import { Transform, TransformOptions } from "../types.js";
3
6
  export declare class O {
4
7
  #private;
5
- register(item: Item.Any): number;
6
- get items(): Item.Any[];
7
- sequence: (...items: Item.Any[]) => Item.Sequence;
8
- stack: (...items: Item.Any[]) => Item.Stack;
9
- clip: (media: Media, start?: number, duration?: number) => Item.Clip;
8
+ state: {
9
+ project: TimelineFile;
10
+ };
11
+ constructor(state: {
12
+ project: TimelineFile;
13
+ });
14
+ require<T extends Item.Any>(id: Id | undefined): T | undefined;
15
+ register(item: Item.Any): void;
16
+ textStyle: (style: TextStyleOptions) => Item.TextStyle;
17
+ spatial: (transform: Transform) => Item.Spatial;
18
+ sequence: (...items: Item.Any[]) => Item.Any;
19
+ stack: (...items: Item.Any[]) => Item.Any;
20
+ video: (media: Media, options?: {
21
+ start?: number;
22
+ duration?: number;
23
+ }) => Item.Video;
24
+ audio: (media: Media, options?: {
25
+ start?: number;
26
+ duration?: number;
27
+ }) => Item.Audio;
10
28
  text: (content: string) => Item.Text;
29
+ gap: (duration: number) => Item.Gap;
11
30
  transition: {
12
31
  crossfade: (duration: number) => Item.Transition;
13
32
  };
33
+ transform: (options?: TransformOptions) => Transform;
34
+ addChildren(parent: Item.Stack | Item.Sequence, ...items: Item.Any[]): void;
35
+ set: <K extends Item.Any>(id: Id, partial: Partial<K>) => void;
14
36
  }
@@ -1,48 +1,147 @@
1
- import { MapG } from "@e280/stz";
1
+ import { hex } from "@e280/stz";
2
2
  import { Effect, Kind } from "../parts/item.js";
3
3
  export class O {
4
- #nextId = 0;
5
- #items = new MapG();
4
+ state;
5
+ constructor(state) {
6
+ this.state = state;
7
+ }
8
+ require(id) {
9
+ if (id === undefined)
10
+ return undefined;
11
+ const item = this.state.project.items.find(item => item.id === id);
12
+ return item;
13
+ }
6
14
  #getId() {
7
- return this.#nextId++;
15
+ return hex.toInteger(hex.random());
8
16
  }
9
- register(item) {
10
- if (!this.#items.has(item.id))
11
- this.#items.set(item.id, item);
12
- return item.id;
17
+ #mutate(fn) {
18
+ this.state.project = fn(this.state.project);
13
19
  }
14
- get items() {
15
- return [...this.#items.values()];
20
+ register(item) {
21
+ this.#mutate(state => ({
22
+ ...state,
23
+ items: [...state.items, item]
24
+ }));
16
25
  }
17
- sequence = (...items) => ({
18
- id: this.#getId(),
19
- kind: Kind.Sequence,
20
- children: items.map(item => this.register(item)),
21
- });
22
- stack = (...items) => ({
23
- id: this.#getId(),
24
- kind: Kind.Stack,
25
- children: items.map(item => this.register(item)),
26
- });
27
- clip = (media, start, duration) => ({
28
- id: this.#getId(),
29
- kind: Kind.Clip,
30
- mediaHash: media.datafile.checksum.hash,
31
- start: start ?? 0,
32
- duration: duration ?? media.duration,
33
- });
34
- text = (content) => ({
35
- id: this.#getId(),
36
- kind: Kind.Text,
37
- content,
38
- });
39
- transition = {
40
- crossfade: (duration) => ({
26
+ textStyle = (style) => {
27
+ const item = {
28
+ id: this.#getId(),
29
+ kind: Kind.TextStyle,
30
+ style
31
+ };
32
+ this.register(item);
33
+ return item;
34
+ };
35
+ spatial = (transform) => {
36
+ const item = {
37
+ id: this.#getId(),
38
+ kind: Kind.Spatial,
39
+ transform
40
+ };
41
+ this.register(item);
42
+ return item;
43
+ };
44
+ sequence = (...items) => {
45
+ const item = {
46
+ id: this.#getId(),
47
+ kind: Kind.Sequence,
48
+ childrenIds: items.map(item => item.id)
49
+ };
50
+ this.register(item);
51
+ return item;
52
+ };
53
+ stack = (...items) => {
54
+ const item = {
55
+ kind: Kind.Stack,
56
+ id: this.#getId(),
57
+ childrenIds: items.map(item => item.id)
58
+ };
59
+ this.register(item);
60
+ return item;
61
+ };
62
+ video = (media, options) => {
63
+ if (!media.hasVideo)
64
+ throw new Error(`Video clip error: media "${media.datafile.filename}" has no video track.`);
65
+ const item = {
66
+ kind: Kind.Video,
67
+ id: this.#getId(),
68
+ mediaHash: media.datafile.checksum.hash,
69
+ start: options?.start ?? 0,
70
+ duration: options?.duration ?? media.duration
71
+ };
72
+ this.register(item);
73
+ return item;
74
+ };
75
+ audio = (media, options) => {
76
+ if (!media.hasAudio)
77
+ throw new Error(`Audio clip error: media "${media.datafile.filename}" has no audio track.`);
78
+ const item = {
79
+ kind: Kind.Audio,
80
+ id: this.#getId(),
81
+ mediaHash: media.datafile.checksum.hash,
82
+ start: options?.start ?? 0,
83
+ duration: options?.duration ?? media.duration
84
+ };
85
+ this.register(item);
86
+ return item;
87
+ };
88
+ text = (content) => {
89
+ const item = {
90
+ id: this.#getId(),
91
+ content,
92
+ kind: Kind.Text,
93
+ duration: 2000
94
+ };
95
+ this.register(item);
96
+ return item;
97
+ };
98
+ gap = (duration) => {
99
+ const item = {
41
100
  id: this.#getId(),
42
- kind: Kind.Transition,
43
- effect: Effect.Crossfade,
44
- duration,
45
- }),
101
+ kind: Kind.Gap,
102
+ duration
103
+ };
104
+ this.register(item);
105
+ return item;
106
+ };
107
+ transition = {
108
+ crossfade: (duration) => {
109
+ const item = {
110
+ id: this.#getId(),
111
+ kind: Kind.Transition,
112
+ effect: Effect.Crossfade,
113
+ duration,
114
+ };
115
+ this.register(item);
116
+ return item;
117
+ },
118
+ };
119
+ transform = (options) => {
120
+ const position = [
121
+ options?.position?.[0] ?? 0,
122
+ options?.position?.[1] ?? 0
123
+ ];
124
+ const scale = [
125
+ options?.scale?.[0] ?? 1,
126
+ options?.scale?.[1] ?? 1
127
+ ];
128
+ const rotation = options?.rotation ?? 0;
129
+ return [position, scale, rotation];
130
+ };
131
+ addChildren(parent, ...items) {
132
+ this.#mutate(state => {
133
+ const parentItem = state.items.find(({ id }) => id === parent.id);
134
+ parentItem.childrenIds.push(...items.map(item => item.id));
135
+ return state;
136
+ });
137
+ }
138
+ set = (id, partial) => {
139
+ this.#mutate(project => ({
140
+ ...project,
141
+ items: project.items.map(item => item.id === id
142
+ ? { ...item, ...partial }
143
+ : item)
144
+ }));
46
145
  };
47
146
  }
48
147
  //# sourceMappingURL=o.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"o.js","sourceRoot":"","sources":["../../../s/timeline/sugar/o.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAG9B,OAAO,EAAC,MAAM,EAAQ,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAEnD,MAAM,OAAO,CAAC;IACb,OAAO,GAAG,CAAC,CAAA;IACX,MAAM,GAAG,IAAI,IAAI,EAAgB,CAAA;IAEjC,MAAM;QACL,OAAO,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;IAED,QAAQ,CAAC,IAAc;QACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAC,EAAE,CAAA;IACf,CAAC;IAED,IAAI,KAAK;QACR,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;IACjC,CAAC;IAED,QAAQ,GAAG,CAAC,GAAG,KAAiB,EAAiB,EAAE,CAAC,CAAC;QACpD,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE;QACjB,IAAI,EAAE,IAAI,CAAC,QAAQ;QACnB,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KAChD,CAAC,CAAA;IAEF,KAAK,GAAG,CAAC,GAAG,KAAiB,EAAc,EAAE,CAAC,CAAC;QAC9C,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE;QACjB,IAAI,EAAE,IAAI,CAAC,KAAK;QAChB,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KAChD,CAAC,CAAA;IAEF,IAAI,GAAG,CAAC,KAAY,EAAE,KAAc,EAAE,QAAiB,EAAa,EAAE,CAAC,CAAC;QACvE,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE;QACjB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI;QACvC,KAAK,EAAE,KAAK,IAAI,CAAC;QACjB,QAAQ,EAAE,QAAQ,IAAI,KAAK,CAAC,QAAQ;KACpC,CAAC,CAAA;IAEF,IAAI,GAAG,CAAC,OAAe,EAAa,EAAE,CAAC,CAAC;QACvC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE;QACjB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO;KACP,CAAC,CAAA;IAEF,UAAU,GAAG;QACZ,SAAS,EAAE,CAAC,QAAgB,EAAmB,EAAE,CAAC,CAAC;YAClD,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE;YACjB,IAAI,EAAE,IAAI,CAAC,UAAU;YACrB,MAAM,EAAE,MAAM,CAAC,SAAS;YACxB,QAAQ;SACR,CAAC;KACF,CAAA;CACD"}
1
+ {"version":3,"file":"o.js","sourceRoot":"","sources":["../../../s/timeline/sugar/o.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,11 @@
1
1
  import { Omni } from "./omni.js";
2
+ import { Driver } from "../../driver/driver.js";
2
3
  import { dummyData } from "../utils/dummy-data.js";
4
+ const driver = await Driver.setup();
3
5
  //
4
6
  // create an omni context
5
7
  //
6
- const omni = new Omni();
8
+ const omni = new Omni(driver);
7
9
  //
8
10
  // load in some media resources
9
11
  //
@@ -14,7 +16,7 @@ const { mediaA, mediaB } = await omni.load({
14
16
  //
15
17
  // create a timeline
16
18
  //
17
- const timeline = omni.timeline(o => o.sequence(o.clip(mediaA), o.transition.crossfade(600), o.stack(o.clip(mediaB), o.text("hello world"))));
19
+ const timeline = omni.timeline(o => o.sequence(o.video(mediaA), o.transition.crossfade(600), o.stack(o.video(mediaB), o.text("hello world"))));
18
20
  //
19
21
  // log the timeline
20
22
  //
@@ -1 +1 @@
1
- {"version":3,"file":"omni-test.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni-test.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AAEhD,EAAE;AACF,yBAAyB;AACzB,EAAE;AAEF,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;AAEvB,EAAE;AACF,+BAA+B;AAC/B,EAAE;AAEF,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;IACxC,MAAM,EAAE,SAAS,EAAE;IACnB,MAAM,EAAE,SAAS,EAAE;CACnB,CAAC,CAAA;AAEF,EAAE;AACF,oBAAoB;AACpB,EAAE;AAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAC7C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EACd,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,EAC3B,CAAC,CAAC,KAAK,CACN,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EACd,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CACrB,CACD,CAAC,CAAA;AAEF,EAAE;AACF,mBAAmB;AACnB,EAAE;AAEF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"omni-test.js","sourceRoot":"","sources":["../../../s/timeline/sugar/omni-test.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AAEhD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;AACnC,EAAE;AACF,yBAAyB;AACzB,EAAE;AAEF,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAA;AAE7B,EAAE;AACF,+BAA+B;AAC/B,EAAE;AAEF,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;IACxC,MAAM,EAAE,SAAS,EAAE;IACnB,MAAM,EAAE,SAAS,EAAE;CACnB,CAAC,CAAA;AAEF,EAAE;AACF,oBAAoB;AACpB,EAAE;AAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAC7C,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EACf,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,EAC3B,CAAC,CAAC,KAAK,CACN,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EACf,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CACrB,CACD,CAAC,CAAA;AAEF,EAAE;AACF,mBAAmB;AACnB,EAAE;AAEF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAA"}
@@ -1,11 +1,17 @@
1
1
  import { O } from "./o.js";
2
2
  import { Item } from "../parts/item.js";
3
3
  import { Media } from "../parts/media.js";
4
- import { TimelineFile } from "../parts/basics.js";
4
+ import { Driver } from "../../driver/driver.js";
5
5
  import { Datafile } from "../utils/datafile.js";
6
+ import { TimelineFile } from "../parts/basics.js";
6
7
  import { ResourcePool } from "../parts/resource-pool.js";
8
+ import { RenderConfig } from "../../driver/fns/schematic.js";
7
9
  export declare class Omni {
10
+ #private;
11
+ private driver;
8
12
  resources: ResourcePool;
13
+ constructor(driver: Driver);
9
14
  load: <S extends Record<string, Promise<Datafile>>>(spec: S) => Promise<{ [K in keyof S]: Media; }>;
10
- timeline: (fn: (o: O) => Item.Sequence) => TimelineFile;
15
+ timeline: (fn: (o: O) => Item.Any) => TimelineFile;
16
+ render: (timeline: TimelineFile, config: RenderConfig) => Promise<void>;
11
17
  }
@@ -1,20 +1,33 @@
1
1
  import { O } from "./o.js";
2
+ import { Export } from "../parts/compositor/export.js";
2
3
  import { ResourcePool } from "../parts/resource-pool.js";
3
4
  export class Omni {
5
+ driver;
4
6
  resources = new ResourcePool();
7
+ #export;
8
+ constructor(driver) {
9
+ this.driver = driver;
10
+ this.#export = new Export(driver);
11
+ }
5
12
  load = async (spec) => {
6
13
  return Object.fromEntries(await Promise.all(Object.entries(spec).map(async ([key, value]) => [key, await this.resources.store(await value)])));
7
14
  };
8
15
  timeline = (fn) => {
9
- const o = new O();
10
- const sequence = fn(o);
11
- return {
12
- format: "timeline",
13
- info: "https://omniclip.app/",
14
- version: 0,
15
- root: o.register(sequence),
16
- items: o.items,
17
- };
16
+ const o = new O({
17
+ project: {
18
+ format: "timeline",
19
+ info: "https://omniclip.app/",
20
+ version: 0,
21
+ items: [],
22
+ rootId: 0
23
+ }
24
+ });
25
+ const root = fn(o);
26
+ o.state.project.rootId = root.id;
27
+ return o.state.project;
28
+ };
29
+ render = async (timeline, config) => {
30
+ await this.#export.render(timeline);
18
31
  };
19
32
  }
20
33
  //# sourceMappingURL=omni.js.map