@softure-ai/marketing-kit 0.15.0 → 0.17.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.
- package/CHANGELOG.md +91 -0
- package/README.md +138 -16
- package/dist/config/schema.d.ts +2 -1
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +7 -0
- package/dist/config/schema.js.map +1 -1
- package/dist/footage/clip-sound.d.ts +58 -0
- package/dist/footage/clip-sound.d.ts.map +1 -0
- package/dist/footage/clip-sound.js +103 -0
- package/dist/footage/clip-sound.js.map +1 -0
- package/dist/footage/declick.d.ts +1 -1
- package/dist/footage/declick.d.ts.map +1 -1
- package/dist/footage/declick.js +3 -4
- package/dist/footage/declick.js.map +1 -1
- package/dist/footage/draft.d.ts +19 -5
- package/dist/footage/draft.d.ts.map +1 -1
- package/dist/footage/draft.js +92 -22
- package/dist/footage/draft.js.map +1 -1
- package/dist/footage/elevenlabs.d.ts +5 -0
- package/dist/footage/elevenlabs.d.ts.map +1 -1
- package/dist/footage/elevenlabs.js +10 -3
- package/dist/footage/elevenlabs.js.map +1 -1
- package/dist/footage/failure.d.ts +12 -1
- package/dist/footage/failure.d.ts.map +1 -1
- package/dist/footage/failure.js +10 -1
- package/dist/footage/failure.js.map +1 -1
- package/dist/footage/fake.d.ts +10 -1
- package/dist/footage/fake.d.ts.map +1 -1
- package/dist/footage/fake.js +19 -4
- package/dist/footage/fake.js.map +1 -1
- package/dist/footage/hyperframes-capture.d.ts +30 -0
- package/dist/footage/hyperframes-capture.d.ts.map +1 -0
- package/dist/footage/hyperframes-capture.js +80 -0
- package/dist/footage/hyperframes-capture.js.map +1 -0
- package/dist/footage/isolate-ranges.d.ts +34 -6
- package/dist/footage/isolate-ranges.d.ts.map +1 -1
- package/dist/footage/isolate-ranges.js +90 -23
- package/dist/footage/isolate-ranges.js.map +1 -1
- package/dist/footage/loudness.d.ts +16 -2
- package/dist/footage/loudness.d.ts.map +1 -1
- package/dist/footage/loudness.js +10 -7
- package/dist/footage/loudness.js.map +1 -1
- package/dist/footage/paid.d.ts +12 -2
- package/dist/footage/paid.d.ts.map +1 -1
- package/dist/footage/paid.js +8 -3
- package/dist/footage/paid.js.map +1 -1
- package/dist/footage/pipeline.d.ts +14 -2
- package/dist/footage/pipeline.d.ts.map +1 -1
- package/dist/footage/pipeline.js +55 -46
- package/dist/footage/pipeline.js.map +1 -1
- package/dist/footage/providers.d.ts +5 -0
- package/dist/footage/providers.d.ts.map +1 -1
- package/dist/footage/providers.js.map +1 -1
- package/dist/footage/render.d.ts +1 -1
- package/dist/footage/render.d.ts.map +1 -1
- package/dist/footage/render.js +4 -3
- package/dist/footage/render.js.map +1 -1
- package/dist/footage/speech-ranges.d.ts +79 -11
- package/dist/footage/speech-ranges.d.ts.map +1 -1
- package/dist/footage/speech-ranges.js +137 -17
- package/dist/footage/speech-ranges.js.map +1 -1
- package/dist/index.d.ts +9 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -5
- package/dist/index.js.map +1 -1
- package/dist/og/index.d.ts +2 -0
- package/dist/og/index.d.ts.map +1 -1
- package/dist/og/index.js +2 -0
- package/dist/og/index.js.map +1 -1
- package/dist/og/photo-cover.d.ts +74 -0
- package/dist/og/photo-cover.d.ts.map +1 -0
- package/dist/og/photo-cover.js +357 -0
- package/dist/og/photo-cover.js.map +1 -0
- package/dist/og/photo.d.ts +51 -0
- package/dist/og/photo.d.ts.map +1 -0
- package/dist/og/photo.js +154 -0
- package/dist/og/photo.js.map +1 -0
- package/dist/voice/provider-failure.d.ts +41 -0
- package/dist/voice/provider-failure.d.ts.map +1 -0
- package/dist/voice/provider-failure.js +68 -0
- package/dist/voice/provider-failure.js.map +1 -0
- package/dist/voice/provider.d.ts +7 -1
- package/dist/voice/provider.d.ts.map +1 -1
- package/dist/voice/provider.js +1 -1
- package/dist/voice/provider.js.map +1 -1
- package/package.json +2 -1
- package/schema/marketing.schema.json +6 -0
- package/src/config/schema.ts +7 -0
- package/src/footage/clip-sound.ts +124 -0
- package/src/footage/declick.ts +3 -4
- package/src/footage/draft.ts +123 -22
- package/src/footage/elevenlabs.ts +11 -3
- package/src/footage/failure.ts +14 -1
- package/src/footage/fake.ts +28 -4
- package/src/footage/hyperframes-capture.ts +100 -0
- package/src/footage/isolate-ranges.ts +124 -29
- package/src/footage/loudness.ts +17 -8
- package/src/footage/paid.ts +25 -3
- package/src/footage/pipeline.ts +68 -47
- package/src/footage/providers.ts +5 -0
- package/src/footage/render.ts +4 -3
- package/src/footage/speech-ranges.ts +184 -19
- package/src/index.ts +49 -1
- package/src/og/index.ts +28 -0
- package/src/og/photo-cover.ts +442 -0
- package/src/og/photo.ts +177 -0
- package/src/voice/provider-failure.ts +98 -0
- package/src/voice/provider.ts +7 -2
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* How hyperframes captured a render, read from the summary it prints at the end (issue #1145). hyperframes 0.9.6 prints
|
|
3
|
+
* `beginframe capture · software gpu · compile 0.8s · extract 8.7s · … · assemble 0.6s` and, after a screenshot
|
|
4
|
+
* capture it did not ask for, a line `Screenshot capture (slower): BeginFrame did not run. …`.
|
|
5
|
+
*/
|
|
6
|
+
/** hyperframes' capture modes: `beginframe` (fast), `screenshot` (slower), `drawelement`. */
|
|
7
|
+
export type HyperframesCapturePath = "beginframe" | "screenshot" | "drawelement";
|
|
8
|
+
/** The browser's GPU mode for the render. */
|
|
9
|
+
export type HyperframesGpuMode = "software" | "hardware";
|
|
10
|
+
/** The pipeline stages hyperframes times, in the order it prints them. */
|
|
11
|
+
export declare const HYPERFRAMES_CAPTURE_STAGES: readonly ["compile", "extract", "audio", "probe", "setup", "capture", "encode", "assemble"];
|
|
12
|
+
export type HyperframesCaptureStage = (typeof HYPERFRAMES_CAPTURE_STAGES)[number];
|
|
13
|
+
export interface HyperframesCapture {
|
|
14
|
+
/** The capture path; null when hyperframes printed none. */
|
|
15
|
+
path: HyperframesCapturePath | null;
|
|
16
|
+
/** The browser's GPU mode; null when hyperframes printed none. */
|
|
17
|
+
gpu: HyperframesGpuMode | null;
|
|
18
|
+
/** Seconds per stage, only the stages hyperframes printed. */
|
|
19
|
+
seconds: Partial<Record<HyperframesCaptureStage, number>>;
|
|
20
|
+
/** The encode ran during the capture (`encode (during capture)`), so its seconds overlap the capture's. */
|
|
21
|
+
isEncodeStreamed: boolean;
|
|
22
|
+
/** hyperframes' hint after a screenshot capture (`Screenshot capture (slower): …`); null when it printed none. */
|
|
23
|
+
fallbackHint: string | null;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* The capture report from hyperframes' output lines (stdout and stderr, in order): the last summary line, plus the
|
|
27
|
+
* screenshot hint when one was printed. Null when no line is a summary (an older or quiet hyperframes).
|
|
28
|
+
*/
|
|
29
|
+
export declare function readHyperframesCapture(lines: readonly string[]): HyperframesCapture | null;
|
|
30
|
+
//# sourceMappingURL=hyperframes-capture.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hyperframes-capture.d.ts","sourceRoot":"","sources":["../../src/footage/hyperframes-capture.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,6FAA6F;AAC7F,MAAM,MAAM,sBAAsB,GAAG,YAAY,GAAG,YAAY,GAAG,aAAa,CAAC;AAEjF,6CAA6C;AAC7C,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,UAAU,CAAC;AAEzD,0EAA0E;AAC1E,eAAO,MAAM,0BAA0B,6FAA8F,CAAC;AAEtI,MAAM,MAAM,uBAAuB,GAAG,CAAC,OAAO,0BAA0B,CAAC,CAAC,MAAM,CAAC,CAAC;AAElF,MAAM,WAAW,kBAAkB;IACjC,4DAA4D;IAC5D,IAAI,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACpC,kEAAkE;IAClE,GAAG,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC/B,8DAA8D;IAC9D,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1D,2GAA2G;IAC3G,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kHAAkH;IAClH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAsDD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,kBAAkB,GAAG,IAAI,CAa1F"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* How hyperframes captured a render, read from the summary it prints at the end (issue #1145). hyperframes 0.9.6 prints
|
|
3
|
+
* `beginframe capture · software gpu · compile 0.8s · extract 8.7s · … · assemble 0.6s` and, after a screenshot
|
|
4
|
+
* capture it did not ask for, a line `Screenshot capture (slower): BeginFrame did not run. …`.
|
|
5
|
+
*/
|
|
6
|
+
/** The pipeline stages hyperframes times, in the order it prints them. */
|
|
7
|
+
export const HYPERFRAMES_CAPTURE_STAGES = ["compile", "extract", "audio", "probe", "setup", "capture", "encode", "assemble"];
|
|
8
|
+
const SEPARATOR = " · ";
|
|
9
|
+
const CAPTURE_PATHS = ["beginframe", "screenshot", "drawelement"];
|
|
10
|
+
const GPU_MODES = ["software", "hardware"];
|
|
11
|
+
const STAGES = HYPERFRAMES_CAPTURE_STAGES;
|
|
12
|
+
const FALLBACK_HINT_PREFIX = "Screenshot capture";
|
|
13
|
+
// SGR colour codes (`\x1b[2m…\x1b[22m`) that hyperframes' dim style may add.
|
|
14
|
+
// eslint-disable-next-line no-control-regex -- the escape character is what the pattern matches
|
|
15
|
+
const ANSI_PATTERN = /\u001B\[[0-9;]*m/g;
|
|
16
|
+
/** hyperframes' `formatDuration`: `8.7s` under a minute, `1m 31.4s` from a minute on. */
|
|
17
|
+
function readDurationSeconds(text) {
|
|
18
|
+
const match = /^(?:(\d+)m )?(\d+(?:\.\d+)?)s$/.exec(text);
|
|
19
|
+
if (match === null)
|
|
20
|
+
return null;
|
|
21
|
+
const minutes = match[1] === undefined ? 0 : Number(match[1]);
|
|
22
|
+
return Math.round((minutes * 60 + Number(match[2])) * 1000) / 1000;
|
|
23
|
+
}
|
|
24
|
+
function readSummaryPart(part) {
|
|
25
|
+
const path = /^(\w+) capture$/.exec(part)?.[1];
|
|
26
|
+
if (path !== undefined)
|
|
27
|
+
return CAPTURE_PATHS.includes(path) ? { kind: "path", path: path } : null;
|
|
28
|
+
const gpu = /^(\w+) gpu$/.exec(part)?.[1];
|
|
29
|
+
if (gpu !== undefined)
|
|
30
|
+
return GPU_MODES.includes(gpu) ? { kind: "gpu", gpu: gpu } : null;
|
|
31
|
+
const stage = /^(\w+)( \(during capture\))? (.+)$/.exec(part);
|
|
32
|
+
if (stage === null)
|
|
33
|
+
return null;
|
|
34
|
+
const [, name = "", streamed, duration = ""] = stage;
|
|
35
|
+
const seconds = readDurationSeconds(duration);
|
|
36
|
+
if (!STAGES.includes(name) || seconds === null)
|
|
37
|
+
return null;
|
|
38
|
+
return { kind: "stage", stage: name, seconds, isStreamed: streamed !== undefined };
|
|
39
|
+
}
|
|
40
|
+
/** A summary line: every ` · ` part is a capture path, a GPU mode or a timed stage. Null for any other line. */
|
|
41
|
+
function readSummaryLine(line) {
|
|
42
|
+
const parts = line.split(SEPARATOR).map(readSummaryPart);
|
|
43
|
+
if (parts.length === 0 || parts.some((part) => part === null))
|
|
44
|
+
return null;
|
|
45
|
+
const capture = { path: null, gpu: null, seconds: {}, isEncodeStreamed: false };
|
|
46
|
+
for (const part of parts) {
|
|
47
|
+
if (part === null)
|
|
48
|
+
continue;
|
|
49
|
+
if (part.kind === "path")
|
|
50
|
+
capture.path = part.path;
|
|
51
|
+
else if (part.kind === "gpu")
|
|
52
|
+
capture.gpu = part.gpu;
|
|
53
|
+
else {
|
|
54
|
+
capture.seconds[part.stage] = part.seconds;
|
|
55
|
+
if (part.stage === "encode" && part.isStreamed)
|
|
56
|
+
capture.isEncodeStreamed = true;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
return capture;
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* The capture report from hyperframes' output lines (stdout and stderr, in order): the last summary line, plus the
|
|
63
|
+
* screenshot hint when one was printed. Null when no line is a summary (an older or quiet hyperframes).
|
|
64
|
+
*/
|
|
65
|
+
export function readHyperframesCapture(lines) {
|
|
66
|
+
let summary = null;
|
|
67
|
+
let fallbackHint = null;
|
|
68
|
+
for (const raw of lines) {
|
|
69
|
+
const line = raw.replace(ANSI_PATTERN, "").trim();
|
|
70
|
+
if (line.length === 0)
|
|
71
|
+
continue;
|
|
72
|
+
if (line.startsWith(FALLBACK_HINT_PREFIX)) {
|
|
73
|
+
fallbackHint = line;
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
76
|
+
summary = readSummaryLine(line) ?? summary;
|
|
77
|
+
}
|
|
78
|
+
return summary === null ? null : { ...summary, fallbackHint };
|
|
79
|
+
}
|
|
80
|
+
//# sourceMappingURL=hyperframes-capture.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hyperframes-capture.js","sourceRoot":"","sources":["../../src/footage/hyperframes-capture.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,25 @@
|
|
|
1
|
+
import { type ProviderFailure } from "../voice/provider-failure.js";
|
|
1
2
|
import type { Edl } from "./edl.js";
|
|
2
3
|
import type { FootageFilm } from "./film.js";
|
|
3
4
|
import { type FootageResult, type FootageRunOptions, type PreparedClip } from "./pipeline.js";
|
|
4
|
-
import { type SpeechRange, type SpeechRangeCacheResolver } from "./speech-ranges.js";
|
|
5
|
+
import { type PlanSpeechRangesOptions, type SpeechRange, type SpeechRangeCacheResolver } from "./speech-ranges.js";
|
|
5
6
|
/**
|
|
6
7
|
* Voice isolation of only what the cut hears (issue #1087): each talking clip's sound ranges (`planSpeechRanges`) are
|
|
7
8
|
* cleaned one by one and cached by the clip's identity, the range in milliseconds and the provider, so an unchanged
|
|
8
9
|
* segment is never paid twice and a changed cut pays only its new ranges. The cleaned ranges are laid back over the
|
|
9
10
|
* clip's own sound into one file as long as the clip: the speech map `renderFootage` takes. A range the provider refuses
|
|
10
11
|
* is asked again, and one refused on every attempt keeps the clip's own sound in its window while the others are laid
|
|
11
|
-
* (issue #1127): only a cancel stops the call.
|
|
12
|
+
* (issue #1127): only a cancel stops the call. The ranges reach the provider's minimum input (`minSeconds`, issue
|
|
13
|
+
* #1140): near ranges of a clip are merged, a short one is widened with the clip's own context and only the part the
|
|
14
|
+
* cut hears is laid; a range that still cannot pass is never sent. A refusal the provider marks not retryable
|
|
15
|
+
* (`isRetryable: false`, e.g. a 400 `audio_too_short`) is not asked again (issue #1141). Every window lands at the
|
|
16
|
+
* level of the clip's pre-gained sound (issue #1159): a bought range records the gain it was cut at next to its cached
|
|
17
|
+
* file, and a cached range cut from the un-gained sound (bought before the pre-gain) is raised by the clip's pre-gain.
|
|
18
|
+
*/
|
|
19
|
+
/**
|
|
20
|
+
* How often a refused range is asked again: `attempts` in all (default 3), waiting `delaysMs[n]` before attempt n + 2.
|
|
21
|
+
* A failure whose `providerFailure.isRetryable` is false ends the range at once.
|
|
12
22
|
*/
|
|
13
|
-
/** How often a refused range is asked again: `attempts` in all (default 3), waiting `delaysMs[n]` before attempt n + 2. */
|
|
14
23
|
export interface SpeechRangeRetry {
|
|
15
24
|
/** Attempts per range, at least 1; default `DEFAULT_SPEECH_RANGE_ATTEMPTS` (3). */
|
|
16
25
|
attempts?: number;
|
|
@@ -24,6 +33,10 @@ export declare const DEFAULT_SPEECH_RANGE_RETRY_DELAYS_MS: readonly number[];
|
|
|
24
33
|
export type IsolateSpeechRangesOptions = Pick<FootageRunOptions, "buildDir" | "cacheDir" | "providers" | "isCommit" | "signal" | "onCharge" | "onProgress" | "onFfmpegFailure"> & {
|
|
25
34
|
/** Seconds added on each side of a sound span; default `DEFAULT_SPEECH_RANGE_MARGIN` (0.25). */
|
|
26
35
|
margin?: number;
|
|
36
|
+
/** Ranges of a clip at most this many seconds apart are isolated as one; default 2, `null` keeps them apart. */
|
|
37
|
+
mergeGap?: PlanSpeechRangesOptions["mergeGap"];
|
|
38
|
+
/** Seconds a range shorter than the provider's minimum is widened past it; default `DEFAULT_SPEECH_RANGE_MIN_PAD` (0.4). */
|
|
39
|
+
minPad?: number;
|
|
27
40
|
/** Retries of a refused range. */
|
|
28
41
|
retry?: SpeechRangeRetry;
|
|
29
42
|
/** Milliseconds of the linear crossfade at every join; default `DEFAULT_SPEECH_RANGE_FADE_MS` (15), 0 switches at once. */
|
|
@@ -47,6 +60,12 @@ export type SpeechRangeOutcome = {
|
|
|
47
60
|
kind: "failed";
|
|
48
61
|
error: string;
|
|
49
62
|
attempts: number;
|
|
63
|
+
/** The provider's structured failure of the last attempt (safe to log); null when it gave none. */
|
|
64
|
+
providerFailure: ProviderFailure | null;
|
|
65
|
+
} | {
|
|
66
|
+
kind: "skipped";
|
|
67
|
+
reason: "too_short";
|
|
68
|
+
minSeconds: number;
|
|
50
69
|
} | {
|
|
51
70
|
kind: "not_bought";
|
|
52
71
|
};
|
|
@@ -60,13 +79,21 @@ export interface IsolatedSpeechRange extends SpeechRange {
|
|
|
60
79
|
laid: boolean;
|
|
61
80
|
/**
|
|
62
81
|
* `cached`; `bought` in this call; `failed` when the provider refused it on every attempt (its window keeps the
|
|
63
|
-
* clip's own sound); `
|
|
82
|
+
* clip's own sound); `skipped` when it is shorter than the provider's minimum even after merging and widening (never
|
|
83
|
+
* sent, its window keeps the clip's own sound); `not_bought` without `isCommit`.
|
|
64
84
|
*/
|
|
65
85
|
outcome: SpeechRangeOutcome;
|
|
86
|
+
/**
|
|
87
|
+
* The dB its cleaned voice was raised by when laid (issue #1159): the clip's pre-gain for a range cut from the
|
|
88
|
+
* clip's un-gained sound, else 0; 0 when it is not laid.
|
|
89
|
+
*/
|
|
90
|
+
gainDb: number;
|
|
66
91
|
}
|
|
67
92
|
export interface IsolatedSpeech {
|
|
68
|
-
/** Every clip's audio for the speech track: its laid file, or
|
|
93
|
+
/** Every clip's audio for the speech track: its laid file, or its lossless sound when none of its ranges is laid. */
|
|
69
94
|
speech: Record<string, string>;
|
|
95
|
+
/** Each clip's pre-gain in dB (`prepareClipSounds`): the gain of the sound its speech file is made from (issue #1159). */
|
|
96
|
+
speechGainDb: Record<string, number>;
|
|
70
97
|
ranges: IsolatedSpeechRange[];
|
|
71
98
|
}
|
|
72
99
|
/**
|
|
@@ -74,7 +101,8 @@ export interface IsolatedSpeech {
|
|
|
74
101
|
* With `isCommit` every uncached range is bought (`onCharge` step `isolate`, item the clip id, with its `range`);
|
|
75
102
|
* without it only cached ranges are laid, a free draft, and `ranges` names what is still missing. A refused range is
|
|
76
103
|
* retried (`retry`); one refused on every attempt is answered `failed` and the call still succeeds. Each clip with a
|
|
77
|
-
* laid range gets `<buildDir>/audio/<id>.ranges.
|
|
104
|
+
* laid range gets `<buildDir>/audio/<id>.ranges.wav`, crossfaded at every join (`fadeMs`). The isolator hears, and the
|
|
105
|
+
* ranges are laid over, each clip's lossless, pre-gained sound (`prepareClipSounds`, issue #1139).
|
|
78
106
|
*/
|
|
79
107
|
export declare function isolateSpeechRanges(film: FootageFilm, clips: PreparedClip[], edl: Edl, options: IsolateSpeechRangesOptions): Promise<FootageResult<IsolatedSpeech>>;
|
|
80
108
|
//# sourceMappingURL=isolate-ranges.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isolate-ranges.d.ts","sourceRoot":"","sources":["../../src/footage/isolate-ranges.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"isolate-ranges.d.ts","sourceRoot":"","sources":["../../src/footage/isolate-ranges.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,17 @@
|
|
|
1
|
-
import { existsSync, mkdirSync } from "node:fs";
|
|
1
|
+
import { existsSync, mkdirSync, readFileSync, rmSync } from "node:fs";
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import { setTimeout as sleep } from "node:timers/promises";
|
|
4
|
+
import { describeProviderFailure } from "../voice/provider-failure.js";
|
|
4
5
|
import { err, ok } from "./failure.js";
|
|
5
6
|
import { probeAudio } from "./audio.js";
|
|
7
|
+
import { prepareClipSounds } from "./clip-sound.js";
|
|
8
|
+
import { isSilent, readLoudnessMeasurement } from "./loudness.js";
|
|
6
9
|
import { writeCacheFile } from "./cache.js";
|
|
7
10
|
import { getClipCacheKey } from "./paid.js";
|
|
8
11
|
import { getFfmpegReporting } from "./pipeline.js";
|
|
9
|
-
import { runFfmpeg, withFfmpegFailureReporting } from "./process.js";
|
|
12
|
+
import { runFfmpeg, runProcess, withFfmpegFailureReporting } from "./process.js";
|
|
10
13
|
import { toPaidAudio } from "./providers.js";
|
|
11
|
-
import { buildRangeAudioArgs, buildRangeLayArgs, getSpeechRangeCache, getSpeechRangeWindows, planSpeechRanges, DEFAULT_SPEECH_RANGE_FADE_MS, } from "./speech-ranges.js";
|
|
14
|
+
import { buildRangeAudioArgs, buildRangeLayArgs, buildRangeMeasureArgs, formatSpeechRangeGain, getPlanOptions, getRangeInputGainDb, getSpeechRangeGainPath, getSpeechRangeCache, getSpeechRangeWindows, planSpeechRanges, readSpeechRangeGain, DEFAULT_SPEECH_RANGE_FADE_MS, } from "./speech-ranges.js";
|
|
12
15
|
export const DEFAULT_SPEECH_RANGE_ATTEMPTS = 3;
|
|
13
16
|
export const DEFAULT_SPEECH_RANGE_RETRY_DELAYS_MS = [1000, 2000];
|
|
14
17
|
/**
|
|
@@ -16,7 +19,8 @@ export const DEFAULT_SPEECH_RANGE_RETRY_DELAYS_MS = [1000, 2000];
|
|
|
16
19
|
* With `isCommit` every uncached range is bought (`onCharge` step `isolate`, item the clip id, with its `range`);
|
|
17
20
|
* without it only cached ranges are laid, a free draft, and `ranges` names what is still missing. A refused range is
|
|
18
21
|
* retried (`retry`); one refused on every attempt is answered `failed` and the call still succeeds. Each clip with a
|
|
19
|
-
* laid range gets `<buildDir>/audio/<id>.ranges.
|
|
22
|
+
* laid range gets `<buildDir>/audio/<id>.ranges.wav`, crossfaded at every join (`fadeMs`). The isolator hears, and the
|
|
23
|
+
* ranges are laid over, each clip's lossless, pre-gained sound (`prepareClipSounds`, issue #1139).
|
|
20
24
|
*/
|
|
21
25
|
export function isolateSpeechRanges(film, clips, edl, options) {
|
|
22
26
|
const log = options.log ?? (() => undefined);
|
|
@@ -26,7 +30,7 @@ export function isolateSpeechRanges(film, clips, edl, options) {
|
|
|
26
30
|
async function runIsolateSpeechRanges(film, clips, edl, options, log) {
|
|
27
31
|
const { buildDir, providers, signal } = options;
|
|
28
32
|
const aborting = signal === undefined ? {} : { signal };
|
|
29
|
-
const planned = planSpeechRanges(edl, clips.map((clip) => ({ id: clip.clip.id, role: clip.clip.role, duration: clip.duration })), options
|
|
33
|
+
const planned = planSpeechRanges(edl, clips.map((clip) => ({ id: clip.clip.id, role: clip.clip.role, duration: clip.duration })), getPlanOptions(options, providers.isolation));
|
|
30
34
|
const byClip = new Map(clips.map((clip) => [clip.clip.id, clip]));
|
|
31
35
|
const clipKeys = new Map();
|
|
32
36
|
const ranges = [];
|
|
@@ -40,15 +44,27 @@ async function runIsolateSpeechRanges(film, clips, edl, options, log) {
|
|
|
40
44
|
clipKeys.set(range.clip, clipKey);
|
|
41
45
|
}
|
|
42
46
|
const cache = options.rangeCache?.(range, clipKey) ?? getSpeechRangeCache(film.id, clipKey, range, { cacheDir: options.cacheDir, provider: providers.isolation.id });
|
|
47
|
+
if (range.skip !== undefined) {
|
|
48
|
+
ranges.push({ ...range, cacheKey: cache.key, path: cache.path, cached: false, laid: false, outcome: { kind: "skipped", ...range.skip }, gainDb: 0 });
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
43
51
|
const cached = existsSync(cache.path);
|
|
44
|
-
ranges.push({ ...range, cacheKey: cache.key, path: cache.path, cached, laid: cached, outcome: cached ? { kind: "cached" } : { kind: "not_bought" } });
|
|
52
|
+
ranges.push({ ...range, cacheKey: cache.key, path: cache.path, cached, laid: cached, outcome: cached ? { kind: "cached" } : { kind: "not_bought" }, gainDb: 0 });
|
|
45
53
|
}
|
|
46
|
-
const
|
|
54
|
+
const skipped = ranges.filter((range) => range.outcome.kind === "skipped");
|
|
55
|
+
if (skipped.length > 0) {
|
|
56
|
+
const minimum = providers.isolation.minSeconds ?? 0;
|
|
57
|
+
log(`voice isolation: ${String(skipped.length)} range${skipped.length === 1 ? "" : "s"} shorter than ${providers.isolation.id}'s minimum of ${String(minimum)} s even with the clip's whole sound, not sent, laid with the clip's own sound: ${skipped.map(describeRange).join("; ")}.`);
|
|
58
|
+
}
|
|
59
|
+
const buying = options.isCommit ? ranges.filter((range) => range.outcome.kind === "not_bought") : [];
|
|
47
60
|
const total = buying.reduce((sum, range) => sum + (range.endMs - range.startMs) / 1000, 0);
|
|
48
61
|
let done = 0;
|
|
49
62
|
const report = (range, index) => {
|
|
50
63
|
options.onProgress?.({ step: "isolate", item: range.clip, itemIndex: index + 1, itemCount: buying.length, done: Math.round(done * 1000) / 1000, total: Math.round(total * 1000) / 1000 });
|
|
51
64
|
};
|
|
65
|
+
// Every clip's sound, lossless and pre-gained (#1139): what the isolator hears and what the cleaned ranges are laid over.
|
|
66
|
+
const sounds = await prepareClipSounds(clips, { buildDir, ...aborting });
|
|
67
|
+
const getSound = (clip) => sounds[clip.clip.id]?.file ?? clip.file;
|
|
52
68
|
const workDir = join(buildDir, "audio", "ranges");
|
|
53
69
|
for (const [index, range] of buying.entries()) {
|
|
54
70
|
const clip = byClip.get(range.clip);
|
|
@@ -58,8 +74,8 @@ async function runIsolateSpeechRanges(film, clips, edl, options, log) {
|
|
|
58
74
|
report(range, index);
|
|
59
75
|
mkdirSync(workDir, { recursive: true });
|
|
60
76
|
// The provider sees the clip's id and the range as the file name.
|
|
61
|
-
const input = join(workDir, `${range.clip}.${String(range.startMs)}-${String(range.endMs)}.
|
|
62
|
-
await runFfmpeg(`Cutting ${describeRange(range)} for voice isolation`, buildRangeAudioArgs(clip
|
|
77
|
+
const input = join(workDir, `${range.clip}.${String(range.startMs)}-${String(range.endMs)}.wav`);
|
|
78
|
+
await runFfmpeg(`Cutting ${describeRange(range)} for voice isolation`, buildRangeAudioArgs(getSound(clip), range, input), { ...aborting, output: input });
|
|
63
79
|
signal?.throwIfAborted();
|
|
64
80
|
log(`voice isolation (${providers.isolation.id}): ${describeRange(range)}, ${units.toFixed(1)} s.`);
|
|
65
81
|
const answer = await isolateWithRetries({
|
|
@@ -67,18 +83,22 @@ async function runIsolateSpeechRanges(film, clips, edl, options, log) {
|
|
|
67
83
|
isolation: providers.isolation,
|
|
68
84
|
retry: options.retry ?? {},
|
|
69
85
|
...aborting,
|
|
70
|
-
onRefused: (error, attempt) => {
|
|
71
|
-
|
|
86
|
+
onRefused: (error, attempt, providerFailure) => {
|
|
87
|
+
const reason = providerFailure === null ? error : describeProviderFailure(providerFailure);
|
|
88
|
+
log(`voice isolation: ${describeRange(range)} refused (attempt ${String(attempt)}): ${reason}`);
|
|
72
89
|
},
|
|
73
90
|
});
|
|
74
91
|
if (!answer.ok) {
|
|
75
|
-
|
|
92
|
+
rmSync(input, { force: true });
|
|
93
|
+
range.outcome = { kind: "failed", error: answer.error, attempts: answer.attempts, providerFailure: answer.providerFailure };
|
|
76
94
|
done += units;
|
|
77
95
|
report(range, index);
|
|
78
96
|
continue;
|
|
79
97
|
}
|
|
80
98
|
const paid = answer.paid;
|
|
81
99
|
writeCacheFile(range.path, paid.audio);
|
|
100
|
+
// The gain of the sound it was cut from, so a later call lays it at the level of the clip's sound then (#1159).
|
|
101
|
+
writeCacheFile(getSpeechRangeGainPath(range.path), formatSpeechRangeGain(sounds[clip.clip.id]?.gainDb ?? 0));
|
|
82
102
|
range.laid = true;
|
|
83
103
|
range.outcome = { kind: "bought", attempts: answer.attempts };
|
|
84
104
|
options.onCharge?.({
|
|
@@ -103,36 +123,80 @@ async function runIsolateSpeechRanges(film, clips, edl, options, log) {
|
|
|
103
123
|
log(`voice isolation DRY RUN: ${String(missing.length)} range${missing.length === 1 ? "" : "s"} (${seconds.toFixed(1)} s) not cached, laid with the clip's own sound. Run with --commit to pay.`);
|
|
104
124
|
}
|
|
105
125
|
const speech = {};
|
|
126
|
+
const speechGainDb = {};
|
|
106
127
|
for (const clip of clips) {
|
|
107
128
|
const id = clip.clip.id;
|
|
108
|
-
speech[id] = clip
|
|
129
|
+
speech[id] = getSound(clip);
|
|
130
|
+
const clipGainDb = sounds[id]?.gainDb ?? 0;
|
|
131
|
+
speechGainDb[id] = clipGainDb;
|
|
109
132
|
const laidRanges = ranges.filter((range) => range.clip === id && range.laid);
|
|
110
133
|
if (laidRanges.length === 0)
|
|
111
134
|
continue;
|
|
112
135
|
const laid = [];
|
|
113
136
|
for (const window of getSpeechRangeWindows(laidRanges)) {
|
|
114
|
-
const
|
|
115
|
-
if (
|
|
137
|
+
const range = laidRanges.find((candidate) => candidate === window.range);
|
|
138
|
+
if (range === undefined)
|
|
116
139
|
continue;
|
|
140
|
+
const file = range.path;
|
|
117
141
|
const probed = await probeAudio(file, aborting);
|
|
118
142
|
if (!probed.ok)
|
|
119
|
-
return err(`${describeRange(
|
|
120
|
-
|
|
143
|
+
return err(`${describeRange(range)}: the cleaned voice at ${file} does not read (${probed.error}); delete it and run again.`);
|
|
144
|
+
const inputGainDb = await getCachedInputGainDb(range, { sound: sounds[id], file, ...aborting });
|
|
145
|
+
const gainDb = Math.round((clipGainDb - inputGainDb) * 100) / 100 || 0;
|
|
146
|
+
range.gainDb = gainDb;
|
|
147
|
+
if (gainDb !== 0)
|
|
148
|
+
log(`voice isolation: ${describeRange(range)} was cut from the clip's sound at ${String(inputGainDb)} dB, laid over it at ${String(clipGainDb)} dB: raised by ${String(gainDb)} dB.`);
|
|
149
|
+
laid.push({ window, file, isMono: probed.probe.channels === 1, gainDb });
|
|
121
150
|
}
|
|
122
|
-
const output = join(buildDir, "audio", `${id}.ranges.
|
|
151
|
+
const output = join(buildDir, "audio", `${id}.ranges.wav`);
|
|
123
152
|
mkdirSync(join(buildDir, "audio"), { recursive: true });
|
|
124
|
-
await runFfmpeg(`Laying the cleaned voice over clip ${id}`, buildRangeLayArgs(clip
|
|
153
|
+
await runFfmpeg(`Laying the cleaned voice over clip ${id}`, buildRangeLayArgs(getSound(clip), laid, output, { fadeMs: options.fadeMs ?? DEFAULT_SPEECH_RANGE_FADE_MS }), { ...aborting, output });
|
|
125
154
|
speech[id] = output;
|
|
126
155
|
}
|
|
127
|
-
return ok({ speech, ranges });
|
|
156
|
+
return ok({ speech, speechGainDb, ranges });
|
|
157
|
+
}
|
|
158
|
+
/**
|
|
159
|
+
* The gain of the sound a laid range's cleaned voice was cut from (issue #1159): the clip's pre-gain when it was bought
|
|
160
|
+
* in this call; its record (`getSpeechRangeGainPath`) when there is one; else told from its loudness against the same
|
|
161
|
+
* range of the clip's pre-gained sound (`getRangeInputGainDb`), for a range cached before the record existed.
|
|
162
|
+
*/
|
|
163
|
+
async function getCachedInputGainDb(range, input) {
|
|
164
|
+
const clipGainDb = input.sound?.gainDb ?? 0;
|
|
165
|
+
if (range.outcome.kind === "bought" || input.sound === undefined)
|
|
166
|
+
return clipGainDb;
|
|
167
|
+
const record = getSpeechRangeGainPath(input.file);
|
|
168
|
+
if (existsSync(record)) {
|
|
169
|
+
const recorded = readSpeechRangeGain(readFileSync(record, "utf8"));
|
|
170
|
+
if (recorded !== null)
|
|
171
|
+
return recorded;
|
|
172
|
+
}
|
|
173
|
+
if (clipGainDb === 0)
|
|
174
|
+
return 0;
|
|
175
|
+
const cleanedLufs = await measureRangeLoudness(`the cleaned voice of ${describeRange(range)}`, buildRangeMeasureArgs(input.file), input.signal);
|
|
176
|
+
const baseLufs = await measureRangeLoudness(`${describeRange(range)} of the clip's sound`, buildRangeMeasureArgs(input.sound.file, range), input.signal);
|
|
177
|
+
return getRangeInputGainDb({ clipGainDb, cleanedLufs, baseLufs });
|
|
178
|
+
}
|
|
179
|
+
/** Integrated loudness in LUFS of a measuring pass (`buildRangeMeasureArgs`); null for silence. Throws naming `label` when ffmpeg fails. */
|
|
180
|
+
async function measureRangeLoudness(label, args, signal) {
|
|
181
|
+
const step = `Measuring ${label}`;
|
|
182
|
+
const measured = await runProcess({ command: "ffmpeg", args, ...(signal === undefined ? {} : { signal }) });
|
|
183
|
+
if (measured.kind === "not-started")
|
|
184
|
+
throw new Error(`${step}: ffmpeg did not start (${measured.error}).`);
|
|
185
|
+
if (measured.code !== 0)
|
|
186
|
+
throw new Error(`${step}: ffmpeg ended with code ${String(measured.code)}: ${measured.stderr.trim().split("\n").slice(-3).join(" | ")}.`);
|
|
187
|
+
const measurement = readLoudnessMeasurement(measured.stderr);
|
|
188
|
+
if (measurement === null)
|
|
189
|
+
throw new Error(`${step}: ffmpeg printed no loudnorm measurement.`);
|
|
190
|
+
return isSilent(measurement) ? null : measurement.inputI;
|
|
128
191
|
}
|
|
129
|
-
/** Asks the provider for one range's cleaned voice, again after each refusal up to `retry.attempts`; a cancel throws. */
|
|
192
|
+
/** Asks the provider for one range's cleaned voice, again after each retryable refusal up to `retry.attempts`; a cancel throws. */
|
|
130
193
|
async function isolateWithRetries(input) {
|
|
131
194
|
const { audio, isolation, retry, signal, onRefused } = input;
|
|
132
195
|
const attempts = Math.max(1, Math.floor(retry.attempts ?? DEFAULT_SPEECH_RANGE_ATTEMPTS));
|
|
133
196
|
const delays = retry.delaysMs ?? DEFAULT_SPEECH_RANGE_RETRY_DELAYS_MS;
|
|
134
197
|
const wait = retry.wait ?? waitFor;
|
|
135
198
|
let error = "";
|
|
199
|
+
let providerFailure = null;
|
|
136
200
|
for (let attempt = 1; attempt <= attempts; attempt += 1) {
|
|
137
201
|
if (attempt > 1) {
|
|
138
202
|
await wait(delays[Math.min(attempt - 2, delays.length - 1)] ?? 0, signal);
|
|
@@ -143,9 +207,12 @@ async function isolateWithRetries(input) {
|
|
|
143
207
|
if (cleaned.ok)
|
|
144
208
|
return { ok: true, paid: toPaidAudio(cleaned.value), attempts: attempt };
|
|
145
209
|
error = cleaned.error;
|
|
146
|
-
|
|
210
|
+
providerFailure = cleaned.providerFailure ?? null;
|
|
211
|
+
onRefused(error, attempt, providerFailure);
|
|
212
|
+
if (providerFailure?.isRetryable === false)
|
|
213
|
+
return { ok: false, error, attempts: attempt, providerFailure };
|
|
147
214
|
}
|
|
148
|
-
return { ok: false, error, attempts };
|
|
215
|
+
return { ok: false, error, attempts, providerFailure };
|
|
149
216
|
}
|
|
150
217
|
/** Resolves after `ms`, or rejects with the signal's reason when it aborts first. */
|
|
151
218
|
async function waitFor(ms, signal) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isolate-ranges.js","sourceRoot":"","sources":["../../src/footage/isolate-ranges.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"isolate-ranges.js","sourceRoot":"","sources":["../../src/footage/isolate-ranges.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ export declare function readLoudnessMeasurement(stderr: string): LoudnessMeasure
|
|
|
31
31
|
export declare function isSilent(measurement: LoudnessMeasurement): boolean;
|
|
32
32
|
/** The second pass's filter: one linear gain from the measurement, resampled back to the film's rate (`loudnorm` runs at 192 kHz). */
|
|
33
33
|
export declare function getLoudnessFilter(measurement: LoudnessMeasurement, target: LoudnessTarget): string;
|
|
34
|
-
/** The speech track's second pass
|
|
34
|
+
/** The speech track's second pass at the film's rate, encoded by the output's extension (`.wav` lossless float). */
|
|
35
35
|
export declare function buildLoudnessArgs(options: {
|
|
36
36
|
input: string;
|
|
37
37
|
measurement: LoudnessMeasurement;
|
|
@@ -92,7 +92,17 @@ export interface MixLoudnessTarget extends LoudnessTarget {
|
|
|
92
92
|
* `target ± warnTolerance`, under the true peak limit, finishes with a warning instead of failing. Absent: none.
|
|
93
93
|
*/
|
|
94
94
|
warnTolerance?: number;
|
|
95
|
+
/**
|
|
96
|
+
* The finished sound's AAC bitrate in kbps (192 to 512), the film's only lossy audio encode (issue #1139). Absent:
|
|
97
|
+
* `FINISHED_AUDIO_BITRATE` (192).
|
|
98
|
+
*/
|
|
99
|
+
audioBitrateKbps?: number;
|
|
95
100
|
}
|
|
101
|
+
/** The lowest and highest AAC bitrate `MixLoudnessTarget.audioBitrateKbps` takes, in kbps. */
|
|
102
|
+
export declare const AUDIO_BITRATE_RANGE_KBPS: {
|
|
103
|
+
readonly min: 192;
|
|
104
|
+
readonly max: 512;
|
|
105
|
+
};
|
|
96
106
|
/** The limiter's ceiling sits this far under the true peak limit: AAC adds inter-sample overshoot after it. */
|
|
97
107
|
export declare const MIX_ENCODE_HEADROOM = 1;
|
|
98
108
|
/** How many times the mix is encoded and measured before the film fails, unless `MixLoudnessTarget.attempts` says. */
|
|
@@ -177,11 +187,15 @@ export declare function solveMixGain(options: {
|
|
|
177
187
|
* `MIX_LOWPASS_HZ` that keeps AAC's overshoot small.
|
|
178
188
|
*/
|
|
179
189
|
export declare function getMixFilter(attempt: MixAttempt): string;
|
|
180
|
-
/**
|
|
190
|
+
/**
|
|
191
|
+
* The mix's sound on its own through `filter`, encoded as the finished film carries it (AAC at `bitrateKbps`, default
|
|
192
|
+
* `FINISHED_AUDIO_BITRATE`, cut at `MIX_LOWPASS_HZ`, 48 kHz, stereo).
|
|
193
|
+
*/
|
|
181
194
|
export declare function buildMixArgs(options: {
|
|
182
195
|
input: string;
|
|
183
196
|
filter: string;
|
|
184
197
|
output: string;
|
|
198
|
+
bitrateKbps?: number;
|
|
185
199
|
}): string[];
|
|
186
200
|
/** How a measured mix stands against its target: inside it, a near miss inside `warnTolerance`, or outside. */
|
|
187
201
|
export type LoudnessVerdict = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loudness.d.ts","sourceRoot":"","sources":["../../src/footage/loudness.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loudness.d.ts","sourceRoot":"","sources":["../../src/footage/loudness.ts"],"names":[],"mappings":"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"}
|
package/dist/footage/loudness.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { copyFileSync } from "node:fs";
|
|
2
2
|
import { z } from "zod";
|
|
3
|
+
import { getAudioCodecArgs } from "./clip-sound.js";
|
|
3
4
|
import { FOOTAGE_SAMPLE_RATE } from "./normalize.js";
|
|
4
5
|
import { runFfmpeg, runProcess } from "./process.js";
|
|
5
6
|
import { FINISHED_AUDIO_BITRATE } from "./publish.js";
|
|
@@ -80,7 +81,7 @@ export function getLoudnessFilter(measurement, target) {
|
|
|
80
81
|
].join(":");
|
|
81
82
|
return `${filter},aresample=${FOOTAGE_SAMPLE_RATE}`;
|
|
82
83
|
}
|
|
83
|
-
/** The speech track's second pass
|
|
84
|
+
/** The speech track's second pass at the film's rate, encoded by the output's extension (`.wav` lossless float). */
|
|
84
85
|
export function buildLoudnessArgs(options) {
|
|
85
86
|
return [
|
|
86
87
|
"-v",
|
|
@@ -92,10 +93,7 @@ export function buildLoudnessArgs(options) {
|
|
|
92
93
|
getLoudnessFilter(options.measurement, options.target),
|
|
93
94
|
"-ar",
|
|
94
95
|
String(FOOTAGE_SAMPLE_RATE),
|
|
95
|
-
|
|
96
|
-
"libmp3lame",
|
|
97
|
-
"-q:a",
|
|
98
|
-
"2",
|
|
96
|
+
...getAudioCodecArgs(options.output),
|
|
99
97
|
options.output,
|
|
100
98
|
];
|
|
101
99
|
}
|
|
@@ -136,6 +134,8 @@ export async function normalizeLoudness(input, output, target, options = {}) {
|
|
|
136
134
|
}
|
|
137
135
|
/** How far from `LoudnessTarget.target` the finished mix may land, in LU, unless `MixLoudnessTarget.tolerance` says. */
|
|
138
136
|
export const MIX_LOUDNESS_TOLERANCE = 1;
|
|
137
|
+
/** The lowest and highest AAC bitrate `MixLoudnessTarget.audioBitrateKbps` takes, in kbps. */
|
|
138
|
+
export const AUDIO_BITRATE_RANGE_KBPS = { min: 192, max: 512 };
|
|
139
139
|
/** A gain to the window's edge aims this far inside it (at most half the tolerance), so the encode's drift stays in. */
|
|
140
140
|
const MIX_EDGE_MARGIN = 0.2;
|
|
141
141
|
/** The limiter's ceiling sits this far under the true peak limit: AAC adds inter-sample overshoot after it. */
|
|
@@ -278,7 +278,10 @@ export function getMixFilter(attempt) {
|
|
|
278
278
|
const limit = roundTo(10 ** (attempt.ceilingDbtp / 20), 5);
|
|
279
279
|
return [`volume=${attempt.gainDb}dB`, `aresample=${LIMITER_RATE}`, `alimiter=limit=${limit}:level=false:latency=true`, `aresample=${FOOTAGE_SAMPLE_RATE}`, `lowpass=f=${MIX_LOWPASS_HZ}`].join(",");
|
|
280
280
|
}
|
|
281
|
-
/**
|
|
281
|
+
/**
|
|
282
|
+
* The mix's sound on its own through `filter`, encoded as the finished film carries it (AAC at `bitrateKbps`, default
|
|
283
|
+
* `FINISHED_AUDIO_BITRATE`, cut at `MIX_LOWPASS_HZ`, 48 kHz, stereo).
|
|
284
|
+
*/
|
|
282
285
|
export function buildMixArgs(options) {
|
|
283
286
|
return [
|
|
284
287
|
"-v",
|
|
@@ -294,7 +297,7 @@ export function buildMixArgs(options) {
|
|
|
294
297
|
"-c:a",
|
|
295
298
|
"aac",
|
|
296
299
|
"-b:a",
|
|
297
|
-
FINISHED_AUDIO_BITRATE
|
|
300
|
+
options.bitrateKbps === undefined ? FINISHED_AUDIO_BITRATE : `${String(options.bitrateKbps)}k`,
|
|
298
301
|
"-cutoff",
|
|
299
302
|
String(MIX_LOWPASS_HZ),
|
|
300
303
|
"-ar",
|