@softure-ai/marketing-kit 0.17.0 → 0.19.0

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 (85) hide show
  1. package/CHANGELOG.md +52 -0
  2. package/README.md +54 -11
  3. package/dist/config/actions-schema.d.ts +14 -14
  4. package/dist/config/config.d.ts.map +1 -1
  5. package/dist/config/config.js +11 -1
  6. package/dist/config/config.js.map +1 -1
  7. package/dist/config/schema.d.ts +78 -70
  8. package/dist/config/schema.d.ts.map +1 -1
  9. package/dist/config/schema.js +25 -8
  10. package/dist/config/schema.js.map +1 -1
  11. package/dist/config/shot-steps.d.ts +16 -16
  12. package/dist/footage/clip-sound.d.ts +59 -4
  13. package/dist/footage/clip-sound.d.ts.map +1 -1
  14. package/dist/footage/clip-sound.js +58 -12
  15. package/dist/footage/clip-sound.js.map +1 -1
  16. package/dist/footage/compose.d.ts +17 -3
  17. package/dist/footage/compose.d.ts.map +1 -1
  18. package/dist/footage/compose.js +61 -17
  19. package/dist/footage/compose.js.map +1 -1
  20. package/dist/footage/declick.d.ts +49 -41
  21. package/dist/footage/declick.d.ts.map +1 -1
  22. package/dist/footage/declick.js +181 -92
  23. package/dist/footage/declick.js.map +1 -1
  24. package/dist/footage/film.d.ts +45 -2
  25. package/dist/footage/film.d.ts.map +1 -1
  26. package/dist/footage/film.js +23 -0
  27. package/dist/footage/film.js.map +1 -1
  28. package/dist/footage/isolate-ranges.d.ts +5 -0
  29. package/dist/footage/isolate-ranges.d.ts.map +1 -1
  30. package/dist/footage/isolate-ranges.js +4 -2
  31. package/dist/footage/isolate-ranges.js.map +1 -1
  32. package/dist/footage/paid.d.ts +1 -1
  33. package/dist/footage/paid.d.ts.map +1 -1
  34. package/dist/footage/paid.js +3 -2
  35. package/dist/footage/paid.js.map +1 -1
  36. package/dist/footage/pipeline.d.ts +11 -0
  37. package/dist/footage/pipeline.d.ts.map +1 -1
  38. package/dist/footage/pipeline.js +28 -17
  39. package/dist/footage/pipeline.js.map +1 -1
  40. package/dist/footage/render.d.ts +5 -1
  41. package/dist/footage/render.d.ts.map +1 -1
  42. package/dist/footage/render.js +6 -2
  43. package/dist/footage/render.js.map +1 -1
  44. package/dist/index.d.ts +5 -5
  45. package/dist/index.d.ts.map +1 -1
  46. package/dist/index.js +5 -5
  47. package/dist/index.js.map +1 -1
  48. package/dist/og/character-map.d.ts +2 -1
  49. package/dist/og/character-map.d.ts.map +1 -1
  50. package/dist/og/character-map.js +7 -63
  51. package/dist/og/character-map.js.map +1 -1
  52. package/dist/og/font-file.d.ts +53 -0
  53. package/dist/og/font-file.d.ts.map +1 -0
  54. package/dist/og/font-file.js +153 -0
  55. package/dist/og/font-file.js.map +1 -0
  56. package/dist/og/font-tables.d.ts +25 -0
  57. package/dist/og/font-tables.d.ts.map +1 -0
  58. package/dist/og/font-tables.js +212 -0
  59. package/dist/og/font-tables.js.map +1 -0
  60. package/dist/og/index.d.ts +3 -1
  61. package/dist/og/index.d.ts.map +1 -1
  62. package/dist/og/index.js +2 -1
  63. package/dist/og/index.js.map +1 -1
  64. package/dist/og/photo-cover.d.ts +22 -0
  65. package/dist/og/photo-cover.d.ts.map +1 -1
  66. package/dist/og/photo-cover.js +27 -9
  67. package/dist/og/photo-cover.js.map +1 -1
  68. package/package.json +1 -1
  69. package/schema/marketing.schema.json +76 -23
  70. package/src/config/config.ts +10 -2
  71. package/src/config/schema.ts +24 -5
  72. package/src/footage/clip-sound.ts +95 -15
  73. package/src/footage/compose.ts +72 -17
  74. package/src/footage/declick.ts +172 -97
  75. package/src/footage/film.ts +54 -2
  76. package/src/footage/isolate-ranges.ts +9 -3
  77. package/src/footage/paid.ts +3 -3
  78. package/src/footage/pipeline.ts +41 -17
  79. package/src/footage/render.ts +7 -3
  80. package/src/index.ts +31 -5
  81. package/src/og/character-map.ts +8 -61
  82. package/src/og/font-file.ts +172 -0
  83. package/src/og/font-tables.ts +221 -0
  84. package/src/og/index.ts +14 -0
  85. package/src/og/photo-cover.ts +46 -11
@@ -4,7 +4,8 @@ import type { FootageProbe } from "./probe.js";
4
4
  /**
5
5
  * Each clip's sound for the speech chain (issue #1139): read from the clip's source with the normalize step's own seek
6
6
  * and length (so the EDL's times hold), brought to 48 kHz stereo, raised by one linear pre-gain to about
7
- * `SPEECH_PRE_GAIN.target` with its true peak kept under `SPEECH_PRE_GAIN.peakCeiling`, and written as 24-bit PCM WAV.
7
+ * `SPEECH_PRE_GAIN.target` with its true peak kept under `SPEECH_PRE_GAIN.peakCeiling`, and written as 24-bit PCM WAV
8
+ * (or, with `speechPeaks: "float"`, raised to the target and written as 32-bit float, issue #1181).
8
9
  * Quiet phone speech is then never encoded lossily at its quiet level: the voice isolator, the speech to text, the cut,
9
10
  * the declick and the loudness pass all work on lossless sound, and the film's final AAC is the only lossy encode.
10
11
  */
@@ -22,10 +23,43 @@ export interface ClipSoundInput {
22
23
  /** Seconds after the trim. */
23
24
  duration: number;
24
25
  }
25
- /** A clip's lossless, pre-gained sound and the gain it got in dB. */
26
+ /**
27
+ * How the pre-gain treats a talking clip's true peak (issue #1181): `ceiling` (the default) stops the gain where the
28
+ * peak reaches `SPEECH_PRE_GAIN.peakCeiling` and writes 24-bit PCM; `float` raises it to the target whatever its peaks
29
+ * and writes 32-bit float PCM, so a peak above the ceiling (or 0 dBFS) cannot clip. Both are one linear gain.
30
+ */
31
+ export type SpeechPeaks = "ceiling" | "float";
32
+ /** A measured talking clip's pre-gain: the measurement before it and what it reached. */
33
+ export interface MeasuredPreGain {
34
+ /** Integrated loudness and true peak of the clip's sound before the pre-gain. */
35
+ inputLufs: number;
36
+ inputTruePeakDbtp: number;
37
+ /** Integrated loudness and true peak after it (the input plus the gain). */
38
+ reachedLufs: number;
39
+ truePeakDbtp: number;
40
+ }
41
+ /**
42
+ * What the pre-gain did to a clip (issue #1181): `on_target` reached `SPEECH_PRE_GAIN.target`; `held_by_peak_ceiling`
43
+ * stopped at the peak ceiling, under the target; `peaks_over_ceiling` reached the target with `speechPeaks: "float"`,
44
+ * its true peak above the ceiling (kept by the float file); `silent` a clip without sound, or silence (0 dB);
45
+ * `shared` a clip that does not talk, gained by the talking clips' mean and not measured.
46
+ */
47
+ export type SpeechPreGain = ({
48
+ kind: "on_target";
49
+ } & MeasuredPreGain) | ({
50
+ kind: "held_by_peak_ceiling";
51
+ } & MeasuredPreGain) | ({
52
+ kind: "peaks_over_ceiling";
53
+ } & MeasuredPreGain) | {
54
+ kind: "silent";
55
+ } | {
56
+ kind: "shared";
57
+ };
58
+ /** A clip's lossless, pre-gained sound, the gain it got in dB and what the gain reached. */
26
59
  export interface ClipSound {
27
60
  file: string;
28
61
  gainDb: number;
62
+ preGain: SpeechPreGain;
29
63
  }
30
64
  /** The measuring pass over the trimmed clip's sound, after the same format change the extraction makes; writes nothing. */
31
65
  export declare function buildClipSoundMeasureArgs(input: ClipSoundInput): string[];
@@ -34,21 +68,42 @@ export declare function buildClipSoundMeasureArgs(input: ClipSoundInput): string
34
68
  * its true peak at `SPEECH_PRE_GAIN.peakCeiling`; 0 for silence. Rounded to a hundredth of a dB.
35
69
  */
36
70
  export declare function getPreGainDb(measurement: LoudnessMeasurement | null): number;
37
- /** The trimmed clip's sound, gained by `gainDb`, as a 24-bit 48 kHz stereo WAV; silence as long as the clip when it has none. */
71
+ /**
72
+ * A measured clip's pre-gain in dB and what it reaches (issue #1181). With `peaks: "ceiling"` (the default) the gain
73
+ * is `getPreGainDb`'s, and a clip whose true peak stops it under the target is `held_by_peak_ceiling`; with `"float"`
74
+ * the gain always goes to the target, and a clip whose true peak then passes the ceiling is `peaks_over_ceiling`.
75
+ */
76
+ export declare function getSpeechPreGain(measurement: LoudnessMeasurement | null, options?: {
77
+ peaks?: SpeechPeaks;
78
+ }): {
79
+ gainDb: number;
80
+ preGain: SpeechPreGain;
81
+ };
82
+ /** The log line for a clip whose pre-gain did not simply reach the target; null when it did, or for silence. */
83
+ export declare function describeSpeechPreGain(clipId: string, sound: Pick<ClipSound, "gainDb" | "preGain">): string | null;
84
+ /**
85
+ * The trimmed clip's sound, gained by `gainDb`, as a 48 kHz stereo WAV (24-bit PCM, or 32-bit float with
86
+ * `peaks: "float"`); silence as long as the clip when it has none.
87
+ */
38
88
  export declare function buildClipSoundArgs(input: ClipSoundInput & {
39
89
  gainDb: number;
40
90
  output: string;
91
+ peaks?: SpeechPeaks;
41
92
  }): string[];
42
93
  /** Where a clip's sound goes in the build folder. */
43
94
  export declare function getClipSoundPath(buildDir: string, clipId: string): string;
44
95
  /**
45
96
  * Every clip's lossless, pre-gained sound under `<buildDir>/audio/<id>.wav`, by clip id. A talking clip is gained by its
46
97
  * own measurement (`getPreGainDb`); any other clip by the mean of the talking clips' gains (0 dB without one), so a
47
- * b-roll's own sound under the speech keeps its relation to it. Throws naming the clip when ffmpeg fails.
98
+ * b-roll's own sound under the speech keeps its relation to it. Each answers its `preGain` (issue #1181), and `log` gets
99
+ * a line for every clip the peak ceiling held under the target (or, with `peaks: "float"`, whose peaks pass it).
100
+ * Throws naming the clip when ffmpeg fails.
48
101
  */
49
102
  export declare function prepareClipSounds(clips: readonly ClipSoundInput[], options: {
50
103
  buildDir: string;
51
104
  signal?: AbortSignal;
105
+ peaks?: SpeechPeaks;
106
+ log?: (line: string) => void;
52
107
  }): Promise<Record<string, ClipSound>>;
53
108
  /**
54
109
  * The audio codec for an intermediate file by its extension: `.wav` 32-bit float PCM (no stage clips between stages),
@@ -1 +1 @@
1
- {"version":3,"file":"clip-sound.d.ts","sourceRoot":"","sources":["../../src/footage/clip-sound.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAqC,KAAK,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAG5F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C;;;;;;GAMG;AAEH,0HAA0H;AAC1H,eAAO,MAAM,eAAe;;;CAA4C,CAAC;AAKzE,mGAAmG;AACnG,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC;IAChD,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IACtC,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qEAAqE;AACrE,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AASD,2HAA2H;AAC3H,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,EAAE,CAIzE;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,mBAAmB,GAAG,IAAI,GAAG,MAAM,CAK5E;AAED,iIAAiI;AACjI,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,EAAE,CAKvG;AAED,qDAAqD;AACrD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAEzE;AAcD;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,cAAc,EAAE,EAAE,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAkBjK;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAK1D"}
1
+ {"version":3,"file":"clip-sound.d.ts","sourceRoot":"","sources":["../../src/footage/clip-sound.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,8 @@ import { runFfmpeg, runProcess } from "./process.js";
6
6
  /**
7
7
  * Each clip's sound for the speech chain (issue #1139): read from the clip's source with the normalize step's own seek
8
8
  * and length (so the EDL's times hold), brought to 48 kHz stereo, raised by one linear pre-gain to about
9
- * `SPEECH_PRE_GAIN.target` with its true peak kept under `SPEECH_PRE_GAIN.peakCeiling`, and written as 24-bit PCM WAV.
9
+ * `SPEECH_PRE_GAIN.target` with its true peak kept under `SPEECH_PRE_GAIN.peakCeiling`, and written as 24-bit PCM WAV
10
+ * (or, with `speechPeaks: "float"`, raised to the target and written as 32-bit float, issue #1181).
10
11
  * Quiet phone speech is then never encoded lossily at its quiet level: the voice isolator, the speech to text, the cut,
11
12
  * the declick and the loudness pass all work on lossless sound, and the film's final AAC is the only lossy encode.
12
13
  */
@@ -30,15 +31,52 @@ export function buildClipSoundMeasureArgs(input) {
30
31
  * its true peak at `SPEECH_PRE_GAIN.peakCeiling`; 0 for silence. Rounded to a hundredth of a dB.
31
32
  */
32
33
  export function getPreGainDb(measurement) {
34
+ return getSpeechPreGain(measurement).gainDb;
35
+ }
36
+ /** Rounds to a hundredth, without a negative zero. */
37
+ function roundDb(value) {
38
+ return Math.round(value * 100) / 100 || 0;
39
+ }
40
+ /**
41
+ * A measured clip's pre-gain in dB and what it reaches (issue #1181). With `peaks: "ceiling"` (the default) the gain
42
+ * is `getPreGainDb`'s, and a clip whose true peak stops it under the target is `held_by_peak_ceiling`; with `"float"`
43
+ * the gain always goes to the target, and a clip whose true peak then passes the ceiling is `peaks_over_ceiling`.
44
+ */
45
+ export function getSpeechPreGain(measurement, options = {}) {
33
46
  if (measurement === null || isSilent(measurement))
34
- return 0;
47
+ return { gainDb: 0, preGain: { kind: "silent" } };
35
48
  const toTarget = SPEECH_PRE_GAIN.target - measurement.inputI;
36
49
  const toCeiling = Number.isFinite(measurement.inputTp) ? SPEECH_PRE_GAIN.peakCeiling - measurement.inputTp : toTarget;
37
- return Math.round(Math.min(toTarget, toCeiling) * 100) / 100 || 0;
50
+ const isHeld = toCeiling < toTarget;
51
+ const gainDb = roundDb(options.peaks === "float" ? toTarget : Math.min(toTarget, toCeiling));
52
+ const measured = {
53
+ inputLufs: roundDb(measurement.inputI),
54
+ inputTruePeakDbtp: roundDb(measurement.inputTp),
55
+ reachedLufs: roundDb(measurement.inputI + gainDb),
56
+ truePeakDbtp: roundDb(measurement.inputTp + gainDb),
57
+ };
58
+ if (!isHeld)
59
+ return { gainDb, preGain: { kind: "on_target", ...measured } };
60
+ return { gainDb, preGain: { kind: options.peaks === "float" ? "peaks_over_ceiling" : "held_by_peak_ceiling", ...measured } };
38
61
  }
39
- /** The trimmed clip's sound, gained by `gainDb`, as a 24-bit 48 kHz stereo WAV; silence as long as the clip when it has none. */
62
+ /** The log line for a clip whose pre-gain did not simply reach the target; null when it did, or for silence. */
63
+ export function describeSpeechPreGain(clipId, sound) {
64
+ const { preGain } = sound;
65
+ if (preGain.kind !== "held_by_peak_ceiling" && preGain.kind !== "peaks_over_ceiling")
66
+ return null;
67
+ const gain = `${sound.gainDb >= 0 ? "+" : ""}${String(sound.gainDb)} dB`;
68
+ const input = `input ${String(preGain.inputLufs)} LUFS, ${String(preGain.inputTruePeakDbtp)} dBTP`;
69
+ if (preGain.kind === "peaks_over_ceiling") {
70
+ return `speech pre-gain: clip ${clipId} raised by ${gain} to ${String(preGain.reachedLufs)} LUFS (${input}); its true peak ${String(preGain.truePeakDbtp)} dBTP is over the ${String(SPEECH_PRE_GAIN.peakCeiling)} dBTP ceiling, kept by the 32-bit float sound.`;
71
+ }
72
+ return `speech pre-gain: clip ${clipId} held by the ${String(SPEECH_PRE_GAIN.peakCeiling)} dBTP peak ceiling at ${gain}: it reaches ${String(preGain.reachedLufs)} LUFS, not ${String(SPEECH_PRE_GAIN.target)} (${input}). speechPeaks: "float" reaches the target without clipping.`;
73
+ }
74
+ /**
75
+ * The trimmed clip's sound, gained by `gainDb`, as a 48 kHz stereo WAV (24-bit PCM, or 32-bit float with
76
+ * `peaks: "float"`); silence as long as the clip when it has none.
77
+ */
40
78
  export function buildClipSoundArgs(input) {
41
- const codec = ["-ar", String(FOOTAGE_SAMPLE_RATE), "-ac", "2", "-c:a", "pcm_s24le", input.output];
79
+ const codec = ["-ar", String(FOOTAGE_SAMPLE_RATE), "-ac", "2", "-c:a", input.peaks === "float" ? "pcm_f32le" : "pcm_s24le", input.output];
42
80
  const { seek, length } = getTrimArgs(input);
43
81
  if (!input.probe.hasAudio)
44
82
  return ["-v", "error", "-y", "-f", "lavfi", "-i", `anullsrc=r=${String(FOOTAGE_SAMPLE_RATE)}:cl=stereo`, ...length, ...codec];
@@ -66,25 +104,33 @@ async function measureClipSound(input, signal) {
66
104
  /**
67
105
  * Every clip's lossless, pre-gained sound under `<buildDir>/audio/<id>.wav`, by clip id. A talking clip is gained by its
68
106
  * own measurement (`getPreGainDb`); any other clip by the mean of the talking clips' gains (0 dB without one), so a
69
- * b-roll's own sound under the speech keeps its relation to it. Throws naming the clip when ffmpeg fails.
107
+ * b-roll's own sound under the speech keeps its relation to it. Each answers its `preGain` (issue #1181), and `log` gets
108
+ * a line for every clip the peak ceiling held under the target (or, with `peaks: "float"`, whose peaks pass it).
109
+ * Throws naming the clip when ffmpeg fails.
70
110
  */
71
111
  export async function prepareClipSounds(clips, options) {
72
112
  const { signal } = options;
73
- const gains = new Map();
113
+ const peaks = options.peaks ?? "ceiling";
114
+ const measured = new Map();
74
115
  for (const clip of clips) {
75
116
  if (clip.clip.role !== "talk")
76
117
  continue;
77
- gains.set(clip.clip.id, getPreGainDb(await measureClipSound(clip, signal)));
118
+ measured.set(clip.clip.id, getSpeechPreGain(await measureClipSound(clip, signal), { peaks }));
78
119
  }
79
- const talking = [...gains.values()];
120
+ const talking = [...measured.values()].map((entry) => entry.gainDb);
80
121
  const sharedGain = talking.length === 0 ? 0 : Math.round((talking.reduce((sum, gain) => sum + gain, 0) / talking.length) * 100) / 100 || 0;
81
122
  const sounds = {};
82
123
  for (const clip of clips) {
83
- const gainDb = gains.get(clip.clip.id) ?? sharedGain;
124
+ const shared = { gainDb: sharedGain, preGain: { kind: "shared" } };
125
+ const { gainDb, preGain } = measured.get(clip.clip.id) ?? shared;
84
126
  const output = getClipSoundPath(options.buildDir, clip.clip.id);
85
127
  mkdirSync(dirname(output), { recursive: true });
86
- await runFfmpeg(`Extracting the sound of clip ${clip.clip.id}`, buildClipSoundArgs({ ...clip, gainDb, output }), { ...(signal === undefined ? {} : { signal }), output });
87
- sounds[clip.clip.id] = { file: output, gainDb };
128
+ await runFfmpeg(`Extracting the sound of clip ${clip.clip.id}`, buildClipSoundArgs({ ...clip, gainDb, output, peaks }), { ...(signal === undefined ? {} : { signal }), output });
129
+ const sound = { file: output, gainDb, preGain };
130
+ sounds[clip.clip.id] = sound;
131
+ const line = describeSpeechPreGain(clip.clip.id, sound);
132
+ if (line !== null)
133
+ options.log?.(line);
88
134
  }
89
135
  return sounds;
90
136
  }
@@ -1 +1 @@
1
- {"version":3,"file":"clip-sound.js","sourceRoot":"","sources":["../../src/footage/clip-sound.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clip-sound.js","sourceRoot":"","sources":["../../src/footage/clip-sound.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ import { type Edl } from "./edl.js";
7
7
  import { type FootageEdit, type FootageFilm } from "./film.js";
8
8
  /** The default cross-fade's length (`DEFAULT_EDIT.fadeFrames` at 30 fps); the outgoing segment plays on under the incoming one for this long. */
9
9
  export declare const FADE_SECONDS: number;
10
- /** The end card's length after the cut. */
10
+ /** The full end card's length after the cut when it sets no `seconds` (`DEFAULT_END_CARD_SECONDS`). */
11
11
  export declare const END_CARD_SECONDS = 3;
12
12
  export interface FootageComposeAssets {
13
13
  /** The normalized clips by id (read when there is no `picture`). */
@@ -24,6 +24,7 @@ export interface FootageComposeAssets {
24
24
  music: string | null;
25
25
  /** The cut's last frame, under the end card. */
26
26
  lastFrame: string;
27
+ /** The end card's logo (the logo card's own, else the brand's), an SVG or a PNG; null for the brand name alone. */
27
28
  logo: string | null;
28
29
  sfx: Partial<Record<SfxEvent, string>>;
29
30
  }
@@ -48,7 +49,7 @@ export interface FootageComposeInput {
48
49
  brandName: string;
49
50
  locale: string;
50
51
  }
51
- /** The film's length: the cut plus the end card. */
52
+ /** The film's length: the cut plus the end card (`getEndCardSeconds`). */
52
53
  export declare function getFootageFilmSeconds(film: Pick<FootageFilm, "endCard">, edl: Edl): number;
53
54
  /** The picture scale each segment starts at: `zoom` cuts alternate between punched in (`zoomPercent`) and back out. */
54
55
  export declare function getSegmentScales(edl: Edl, zoomPercent?: number): number[];
@@ -66,9 +67,22 @@ export interface FootageSfxCue {
66
67
  }
67
68
  /**
68
69
  * The film's sound effects in film time: a whoosh before every `whoosh` cut, and the end card's whoosh and pop with
69
- * `isEndCardWhoosh`; an event without a file in `sfx` plays nothing. The composition and the film's mix
70
+ * `isEndCardWhoosh` (the pop only when it starts before the film's end); an event without a file in `sfx` plays nothing. The composition and the film's mix
70
71
  * (`buildFilmMixArgs`) both play these.
71
72
  */
72
73
  export declare function getFootageSfxCues(film: FootageFilm, edl: Edl, sfx: Partial<Record<SfxEvent, string>>): FootageSfxCue[];
73
74
  export declare function composeFootage(input: FootageComposeInput): string;
75
+ /**
76
+ * Where the logo card's content sits, in px from the frame's edges: a 9:16 film keeps it inside its caption preset's
77
+ * safe zone (`CAPTION_SAFE_ZONES`, `all` without a preset), centred between equal sides; other frames keep 80 px.
78
+ */
79
+ export declare function getLogoCardBox(film: Pick<FootageFilm, "format" | "captionPreset">, frame: {
80
+ width: number;
81
+ height: number;
82
+ }): {
83
+ top: number;
84
+ bottom: number;
85
+ left: number;
86
+ right: number;
87
+ };
74
88
  //# sourceMappingURL=compose.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/footage/compose.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAiE,KAAK,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC3H,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAoC,KAAK,GAAG,EAAE,MAAM,UAAU,CAAC;AACtE,OAAO,EAAwD,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAcrH,iJAAiJ;AACjJ,eAAO,MAAM,YAAY,QAA4C,CAAC;AAGtE,2CAA2C;AAC3C,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC,MAAM,WAAW,oBAAoB;IACnC,oEAAoE;IACpE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,gDAAgD;IAChD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;CACxC;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,WAAW,CAAC;IAClB,GAAG,EAAE,GAAG,CAAC;IACT,sEAAsE;IACtE,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,OAAO,EAAE,aAAa,CAAC;IACvB,oCAAoC;IACpC,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE;QAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;QAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAAA;KAAE,CAAC;IACjE,MAAM,EAAE,oBAAoB,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,oDAAoD;AACpD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,CAE1F;AAED,uHAAuH;AACvH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,SAA2B,GAAG,MAAM,EAAE,CAO3F;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,aAAa,GAAG,gBAAgB,CAAC,GAAG,MAAM,EAAE,CAMjH;AAED,sHAAsH;AACtH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,EAAE,MAAM,CAAC;IACV,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,GAAG,aAAa,EAAE,CAiBtH;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,MAAM,CA4JjE"}
1
+ {"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/footage/compose.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,8 @@
1
1
  import { escapeHtml, fontFaces, fontStack } from "../compose/html.js";
2
2
  import { CAPTION_LINE_HEIGHT, getCaptionPillCss, getCaptionPositionCss } from "../compose/timeline.js";
3
- import { getCaptionChunkLayouts, getCaptionSpans, getFootageCaptionChunks, isSameCaptionPlace } from "./captions.js";
3
+ import { CAPTION_SAFE_ZONES, getCaptionChunkLayouts, getCaptionSpans, getFootageCaptionChunks, isSameCaptionPlace } from "./captions.js";
4
4
  import { getEdlDuration, getSegmentStarts } from "./edl.js";
5
- import { CAPTION_MIN_FONT_SCALE, DEFAULT_EDIT, getFootageEdit } from "./film.js";
5
+ import { CAPTION_MIN_FONT_SCALE, DEFAULT_EDIT, DEFAULT_END_CARD_SECONDS, DEFAULT_LOGO_END_CARD_FADE_SECONDS, getEndCardSeconds, getFootageEdit, } from "./film.js";
6
6
  import { FOOTAGE_FPS } from "./normalize.js";
7
7
  const r3 = (value) => Math.round(value * 1000) / 1000 || 0;
8
8
  /**
@@ -10,18 +10,23 @@ const r3 = (value) => Math.round(value * 1000) / 1000 || 0;
10
10
  * EDL segment over the normalized clip with its media start, the transitions (`fade` cross-fades from the segment
11
11
  * before over `fadeFrames`, `zoom` punches in by `zoomPercent` on alternate jump cuts, eased over `zoomEaseFrames`, `whoosh` plays the whoosh
12
12
  * sound), a slow zoom on `kenburns` segments, the captions (plain phrases, or the word-highlight pill), the end card
13
- * over the cut's last frame (its whoosh only with `isEndCardWhoosh`), the cut speech track and the ducked music.
13
+ * over the cut's last frame (the full card, or the short logo card; its whoosh only with `isEndCardWhoosh`), the cut
14
+ * speech track and the ducked music.
14
15
  */
15
16
  const COMPOSITION_ID = "film";
16
17
  /** The default cross-fade's length (`DEFAULT_EDIT.fadeFrames` at 30 fps); the outgoing segment plays on under the incoming one for this long. */
17
18
  export const FADE_SECONDS = r3(DEFAULT_EDIT.fadeFrames / FOOTAGE_FPS);
18
19
  /** How far a segment marked `kenburns` zooms when the film's `kenBurnsPercent` is 0 (a hand edit asked for it). */
19
20
  const HAND_KEN_BURNS_PERCENT = 4;
20
- /** The end card's length after the cut. */
21
- export const END_CARD_SECONDS = 3;
22
- /** The film's length: the cut plus the end card. */
21
+ /** The full end card's length after the cut when it sets no `seconds` (`DEFAULT_END_CARD_SECONDS`). */
22
+ export const END_CARD_SECONDS = DEFAULT_END_CARD_SECONDS;
23
+ /** The logo card's line, in px. */
24
+ const LOGO_CARD_LINE_SIZE = 64;
25
+ /** The largest box the logo card's logo is drawn in, in px: an SVG fills it, a PNG is never drawn past its own pixels. */
26
+ const LOGO_CARD_MARK = { width: 720, height: 480 };
27
+ /** The film's length: the cut plus the end card (`getEndCardSeconds`). */
23
28
  export function getFootageFilmSeconds(film, edl) {
24
- return r3(getEdlDuration(edl) + (film.endCard === null ? 0 : END_CARD_SECONDS));
29
+ return r3(getEdlDuration(edl) + getEndCardSeconds(film.endCard));
25
30
  }
26
31
  /** The picture scale each segment starts at: `zoom` cuts alternate between punched in (`zoomPercent`) and back out. */
27
32
  export function getSegmentScales(edl, zoomPercent = DEFAULT_EDIT.zoomPercent) {
@@ -45,7 +50,7 @@ export function getSegmentZoomEases(edl, edit) {
45
50
  }
46
51
  /**
47
52
  * The film's sound effects in film time: a whoosh before every `whoosh` cut, and the end card's whoosh and pop with
48
- * `isEndCardWhoosh`; an event without a file in `sfx` plays nothing. The composition and the film's mix
53
+ * `isEndCardWhoosh` (the pop only when it starts before the film's end); an event without a file in `sfx` plays nothing. The composition and the film's mix
49
54
  * (`buildFilmMixArgs`) both play these.
50
55
  */
51
56
  export function getFootageSfxCues(film, edl, sfx) {
@@ -64,7 +69,9 @@ export function getFootageSfxCues(film, edl, sfx) {
64
69
  });
65
70
  if (film.endCard !== null && edit.isEndCardWhoosh) {
66
71
  play("whoosh", cutEnd, 0.3, 0.57);
67
- play("pop", r3(cutEnd + 0.9), 0.35, 0.72);
72
+ const pop = r3(cutEnd + 0.9);
73
+ if (pop < getFootageFilmSeconds(film, edl))
74
+ play("pop", pop, 0.35, 0.72);
68
75
  }
69
76
  return cues;
70
77
  }
@@ -140,9 +147,16 @@ export function composeFootage(input) {
140
147
  ].join("\n ");
141
148
  const tail = r3(end - cutEnd);
142
149
  const endCard = film.endCard;
150
+ const lastFrameHtml = `<img id="last" class="clip shot" src="${escapeHtml(assets.lastFrame)}" data-start="${cutEnd}" data-duration="${tail}" />`;
151
+ // The full card's entrances were timed for 3 s; a shorter card plays them faster, so the last one ends on screen.
152
+ const pace = endCard === null ? 1 : Math.min(1, getEndCardSeconds(endCard) / DEFAULT_END_CARD_SECONDS);
153
+ const paced = (seconds) => r3(seconds * pace);
143
154
  const endCardHtml = endCard === null
144
155
  ? ""
145
- : `<img id="last" class="clip shot" src="${escapeHtml(assets.lastFrame)}" data-start="${cutEnd}" data-duration="${tail}" />
156
+ : endCard.layout === "logo"
157
+ ? `${lastFrameHtml}
158
+ ${getLogoCardHtml(endCard, assets.logo, input.brandName)}`
159
+ : `${lastFrameHtml}
146
160
  <div class="shade" id="shade"></div>
147
161
  <div class="endcard">
148
162
  <div class="brand" id="ec-brand">${assets.logo === null ? "" : `<img class="logo" src="${escapeHtml(assets.logo)}" alt="" />`}<span>${escapeHtml(input.brandName)}</span></div>
@@ -152,13 +166,16 @@ export function composeFootage(input) {
152
166
  </div>`;
153
167
  const endCardTweens = endCard === null
154
168
  ? []
155
- : [
156
- `tl.fromTo("#shade", { opacity: 0 }, { opacity: 0.82, duration: 0.45, ease: "power2.out" }, ${cutEnd});`,
157
- `tl.fromTo("#ec-brand", { y: 30, opacity: 0 }, { y: 0, opacity: 1, duration: 0.5, ease: "power3.out" }, ${r3(cutEnd + 0.3)});`,
158
- `tl.fromTo("#ec-headline", { y: 40, opacity: 0 }, { y: 0, opacity: 1, duration: 0.6, ease: "power3.out" }, ${r3(cutEnd + 0.45)});`,
159
- `tl.fromTo("#ec-url", { y: 30, opacity: 0, scale: 0.94 }, { y: 0, opacity: 1, scale: 1, duration: 0.55, ease: "power3.out" }, ${r3(cutEnd + 0.9)});`,
160
- ...(endCard.note.length > 0 ? [`tl.fromTo("#ec-note", { opacity: 0 }, { opacity: 1, duration: 0.5, ease: "power2.out" }, ${r3(cutEnd + 1.3)});`] : []),
161
- ];
169
+ : endCard.layout === "logo"
170
+ ? [`tl.fromTo("#ec-logo-card", { opacity: 0 }, { opacity: 1, duration: ${r3(endCard.fadeSeconds ?? DEFAULT_LOGO_END_CARD_FADE_SECONDS)}, ease: "none" }, ${cutEnd});`]
171
+ : [
172
+ `tl.fromTo("#shade", { opacity: 0 }, { opacity: 0.82, duration: ${paced(0.45)}, ease: "power2.out" }, ${cutEnd});`,
173
+ `tl.fromTo("#ec-brand", { y: 30, opacity: 0 }, { y: 0, opacity: 1, duration: ${paced(0.5)}, ease: "power3.out" }, ${r3(cutEnd + paced(0.3))});`,
174
+ `tl.fromTo("#ec-headline", { y: 40, opacity: 0 }, { y: 0, opacity: 1, duration: ${paced(0.6)}, ease: "power3.out" }, ${r3(cutEnd + paced(0.45))});`,
175
+ `tl.fromTo("#ec-url", { y: 30, opacity: 0, scale: 0.94 }, { y: 0, opacity: 1, scale: 1, duration: ${paced(0.55)}, ease: "power3.out" }, ${r3(cutEnd + paced(0.9))});`,
176
+ ...(endCard.note.length > 0 ? [`tl.fromTo("#ec-note", { opacity: 0 }, { opacity: 1, duration: ${paced(0.5)}, ease: "power2.out" }, ${r3(cutEnd + paced(1.3))});`] : []),
177
+ ];
178
+ const logoBox = getLogoCardBox(film, frame);
162
179
  const bodyFont = fontStack(fonts.body, "sans-serif");
163
180
  const headingFont = fonts.heading === null ? bodyFont : fontStack(fonts.heading, "sans-serif");
164
181
  const faces = [...fontFaces(fonts.body), ...fontFaces(fonts.heading)];
@@ -186,6 +203,12 @@ html,body{width:${frame.width}px;height:${frame.height}px;overflow:hidden;backgr
186
203
  .headline{font-family:${headingFont};font-weight:500;font-size:${input.headlineSize}px;letter-spacing:-.025em;line-height:1.02;margin-top:44px}
187
204
  .url{display:inline-block;margin-top:40px;padding:20px 38px;border-radius:999px;font-size:44px;font-weight:600;color:${c.onCta};background:${c.cta}}
188
205
  .note{margin-top:26px;font-size:30px;color:${c.muted}}
206
+ .logocard{position:absolute;inset:0;background:${c.background};opacity:0}
207
+ .logobox{position:absolute;top:${logoBox.top}px;bottom:${logoBox.bottom}px;left:${logoBox.left}px;right:${logoBox.right}px;display:flex;flex-direction:column;justify-content:center;align-items:center;gap:48px;text-align:center}
208
+ .mark{display:block;max-width:min(100%,${LOGO_CARD_MARK.width}px);max-height:${LOGO_CARD_MARK.height}px;width:auto;height:auto}
209
+ .mark.vector{width:min(100%,${LOGO_CARD_MARK.width}px);height:${LOGO_CARD_MARK.height}px;object-fit:contain}
210
+ .markname{font-family:${headingFont};font-weight:600;font-size:96px;letter-spacing:-.02em}
211
+ .logoline{font-family:${headingFont};font-weight:600;font-size:${LOGO_CARD_LINE_SIZE}px;line-height:1.15;letter-spacing:-.01em}
189
212
  </style>
190
213
  </head>
191
214
  <body>
@@ -212,6 +235,27 @@ window.__timelines["${COMPOSITION_ID}"] = tl;
212
235
  </html>
213
236
  `;
214
237
  }
238
+ /**
239
+ * The logo card (`layout: "logo"`): the brand's background over the whole frame, the logo (an SVG drawn as a vector to
240
+ * fill its box, a PNG at most at its own size, so neither is drawn soft) or the brand name, and the optional line.
241
+ */
242
+ function getLogoCardHtml(card, logo, brandName) {
243
+ const isVector = logo !== null && /\.svg$/i.test(logo);
244
+ const mark = logo === null ? `<span class="markname">${escapeHtml(brandName)}</span>` : `<img class="mark${isVector ? " vector" : ""}" src="${escapeHtml(logo)}" alt="" />`;
245
+ const line = card.line.trim().length > 0 ? `<p class="logoline">${escapeHtml(card.line)}</p>` : "";
246
+ return `<div class="logocard" id="ec-logo-card"><div class="logobox">${mark}${line}</div></div>`;
247
+ }
248
+ /**
249
+ * Where the logo card's content sits, in px from the frame's edges: a 9:16 film keeps it inside its caption preset's
250
+ * safe zone (`CAPTION_SAFE_ZONES`, `all` without a preset), centred between equal sides; other frames keep 80 px.
251
+ */
252
+ export function getLogoCardBox(film, frame) {
253
+ if (film.format !== "9:16" || frame.height !== 1920)
254
+ return { top: 80, bottom: 80, left: 80, right: 80 };
255
+ const zone = CAPTION_SAFE_ZONES[film.captionPreset ?? "all"];
256
+ const side = Math.max(zone.left, zone.right);
257
+ return { top: zone.top, bottom: zone.bottom, left: side, right: side };
258
+ }
215
259
  /**
216
260
  * A page script that shrinks each caption's font in 1 px steps until its text takes at most `maxLines` lines, or the
217
261
  * font reaches `minFontSize`. Only the browser knows how the font wraps, so it measures there: once at load and again
@@ -1 +1 @@
1
- {"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/footage/compose.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/footage/compose.ts"],"names":[],"mappings":"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"}