@softure-ai/marketing-kit 0.18.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.
- package/CHANGELOG.md +12 -0
- package/README.md +9 -0
- package/dist/footage/clip-sound.d.ts +59 -4
- package/dist/footage/clip-sound.d.ts.map +1 -1
- package/dist/footage/clip-sound.js +58 -12
- package/dist/footage/clip-sound.js.map +1 -1
- package/dist/footage/isolate-ranges.d.ts +5 -0
- package/dist/footage/isolate-ranges.d.ts.map +1 -1
- package/dist/footage/isolate-ranges.js +4 -2
- package/dist/footage/isolate-ranges.js.map +1 -1
- package/dist/footage/pipeline.d.ts +11 -0
- package/dist/footage/pipeline.d.ts.map +1 -1
- package/dist/footage/pipeline.js +15 -9
- package/dist/footage/pipeline.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/src/footage/clip-sound.ts +95 -15
- package/src/footage/isolate-ranges.ts +9 -3
- package/src/footage/pipeline.ts +29 -10
- package/src/index.ts +5 -0
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,18 @@ Newest first. Each version lists what changed for an app that uses `@softure-ai/
|
|
|
4
4
|
production, the version gets a line `verified in: <app>@<commit>` ([docs/05](../../docs/05-adoption-playbook.md),
|
|
5
5
|
"Definition of done"). Versions before the first one below are described in their GitHub Releases (`marketing-kit@x.y.z`).
|
|
6
6
|
|
|
7
|
+
## 0.19.0
|
|
8
|
+
|
|
9
|
+
- **The speech pre-gain says what it reached, and can reach the target on peaky speech (#1181):** quiet phone speech
|
|
10
|
+
with a few short peaks was held by the −3 dBTP ceiling around −26 to −28 LUFS instead of −23, silently.
|
|
11
|
+
`ClipSound.preGain`, `IsolatedSpeech.speechPreGain` and `TranscribeOutcome.speechPreGain` answer `on_target`,
|
|
12
|
+
`held_by_peak_ceiling` or `peaks_over_ceiling` with `inputLufs`, `inputTruePeakDbtp`, `reachedLufs` and
|
|
13
|
+
`truePeakDbtp` (or `silent`, or `shared` for a non-talking clip), and the `log` names every held clip. The opt-in
|
|
14
|
+
`speechPeaks: "float"` (`FootageRunOptions`, `IsolateSpeechRangesOptions`, `prepareClipSounds({ peaks })`) raises
|
|
15
|
+
the clip to the target by the same single linear gain and writes its sound as 32-bit float WAV, so the peaks cannot
|
|
16
|
+
clip; no limiter or gate touches the speech. New: `getSpeechPreGain`, `describeSpeechPreGain`, types
|
|
17
|
+
`SpeechPreGain`, `MeasuredPreGain`, `SpeechPeaks`. Additive: `gainDb` and `speechGainDb` stay.
|
|
18
|
+
|
|
7
19
|
## 0.18.0
|
|
8
20
|
|
|
9
21
|
- **The speech declick repairs impulses and no longer gates speech (#1170):** `speech.declick` `gentle` and `strong`
|
package/README.md
CHANGED
|
@@ -738,6 +738,15 @@ softure-marketing footage <film> --step=render # the EDL as it is, maybe e
|
|
|
738
738
|
it (`assets/speech.raw.wav`, `speech.declicked.wav`, `speech.wav`) is float WAV, so quiet speech is never encoded
|
|
739
739
|
lossily at its quiet level and the film's final AAC (`mixLoudness.audioBitrateKbps`, 192 to 512 kbps, default 192,
|
|
740
740
|
48 kHz) is the only lossy encode.
|
|
741
|
+
- **What the pre-gain reached (issue #1181):** quiet speech with a few short peaks (a mouth click, a bump on the
|
|
742
|
+
microphone) has a crest of about 25 dB, so the −3 dBTP ceiling stops the gain under −23 LUFS. Each `ClipSound`
|
|
743
|
+
answers `preGain`, and `transcribeFootage` / `isolateSpeechRanges` answer `speechPreGain` by clip id: `on_target`,
|
|
744
|
+
`held_by_peak_ceiling` or `peaks_over_ceiling` (each with `inputLufs`, `inputTruePeakDbtp`, `reachedLufs`,
|
|
745
|
+
`truePeakDbtp`), `silent`, or `shared` (a non-talking clip). The `log` gets one line for every clip the ceiling
|
|
746
|
+
held. `speechPeaks: "float"` (opt-in, in the run options and `isolateSpeechRanges`) raises every talking clip to the
|
|
747
|
+
target with the same single linear gain and writes the clip sound as 32-bit float WAV, so its rare peaks above the
|
|
748
|
+
ceiling (or 0 dBFS) do not clip; the film's loudness pass keeps its own true-peak limit. Only the range cut sent to
|
|
749
|
+
the voice isolator stays 24-bit, so a peak above 0 dBFS is cut there, in what the provider hears, and nowhere else.
|
|
741
750
|
- **Publishable output:** the speech track is measured and normalized to `loudness` (default −14 LUFS integrated,
|
|
742
751
|
−1 dBTP true peak; two-pass `loudnorm`, one linear gain) before the music goes under it, so a quiet phone clip is
|
|
743
752
|
not left quiet and a loud one does not clip; `"loudness": false` leaves it as filmed. **Before hyperframes renders a
|
|
@@ -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
|
-
/**
|
|
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
|
-
/**
|
|
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.
|
|
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
|
|
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;;;;;;;GAOG;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;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC;AAE9C,yFAAyF;AACzF,MAAM,WAAW,eAAe;IAC9B,iFAAiF;IACjF,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,4EAA4E;IAC5E,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GACrB,CAAC;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GAAG,eAAe,CAAC,GACzC,CAAC;IAAE,IAAI,EAAE,sBAAsB,CAAA;CAAE,GAAG,eAAe,CAAC,GACpD,CAAC;IAAE,IAAI,EAAE,oBAAoB,CAAA;CAAE,GAAG,eAAe,CAAC,GAClD;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEvB,4FAA4F;AAC5F,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,CAAC;CACxB;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,CAE5E;AAOD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,mBAAmB,GAAG,IAAI,EAAE,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,WAAW,CAAA;CAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,aAAa,CAAA;CAAE,CAc3J;AAED,gHAAgH;AAChH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC,GAAG,MAAM,GAAG,IAAI,CASjH;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,WAAW,CAAA;CAAE,GAAG,MAAM,EAAE,CAK5H;AAED,qDAAqD;AACrD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAEzE;AAcD;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,cAAc,EAAE,EAChC,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAAC,KAAK,CAAC,EAAE,WAAW,CAAC;IAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,GACrG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAuBpC;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAK1D"}
|
|
@@ -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
|
-
|
|
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
|
|
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.
|
|
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
|
|
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
|
-
|
|
118
|
+
measured.set(clip.clip.id, getSpeechPreGain(await measureClipSound(clip, signal), { peaks }));
|
|
78
119
|
}
|
|
79
|
-
const talking = [...
|
|
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
|
|
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
|
-
|
|
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":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGnD,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAA4B,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAGrD
|
|
1
|
+
{"version":3,"file":"clip-sound.js","sourceRoot":"","sources":["../../src/footage/clip-sound.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type ProviderFailure } from "../voice/provider-failure.js";
|
|
2
|
+
import { type SpeechPeaks, type SpeechPreGain } from "./clip-sound.js";
|
|
2
3
|
import type { Edl } from "./edl.js";
|
|
3
4
|
import type { FootageFilm } from "./film.js";
|
|
4
5
|
import { type FootageResult, type FootageRunOptions, type PreparedClip } from "./pipeline.js";
|
|
@@ -48,6 +49,8 @@ export type IsolateSpeechRangesOptions = Pick<FootageRunOptions, "buildDir" | "c
|
|
|
48
49
|
* An app that already holds paid ranges under its own keys points the block at them.
|
|
49
50
|
*/
|
|
50
51
|
rangeCache?: SpeechRangeCacheResolver;
|
|
52
|
+
/** How the clip sound's pre-gain treats a true peak above the ceiling (`SpeechPeaks`, issue #1181); default `ceiling`. */
|
|
53
|
+
speechPeaks?: SpeechPeaks;
|
|
51
54
|
log?: (line: string) => void;
|
|
52
55
|
};
|
|
53
56
|
/** What happened to a range in this call. */
|
|
@@ -94,6 +97,8 @@ export interface IsolatedSpeech {
|
|
|
94
97
|
speech: Record<string, string>;
|
|
95
98
|
/** Each clip's pre-gain in dB (`prepareClipSounds`): the gain of the sound its speech file is made from (issue #1159). */
|
|
96
99
|
speechGainDb: Record<string, number>;
|
|
100
|
+
/** What each clip's pre-gain reached (`ClipSound.preGain`, issue #1181): on target, or held by the peak ceiling. */
|
|
101
|
+
speechPreGain: Record<string, SpeechPreGain>;
|
|
97
102
|
ranges: IsolatedSpeechRange[];
|
|
98
103
|
}
|
|
99
104
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isolate-ranges.d.ts","sourceRoot":"","sources":["../../src/footage/isolate-ranges.ts"],"names":[],"mappings":"AAIA,OAAO,EAA2B,KAAK,eAAe,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"isolate-ranges.d.ts","sourceRoot":"","sources":["../../src/footage/isolate-ranges.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,7 +63,7 @@ async function runIsolateSpeechRanges(film, clips, edl, options, log) {
|
|
|
63
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 });
|
|
64
64
|
};
|
|
65
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 });
|
|
66
|
+
const sounds = await prepareClipSounds(clips, { buildDir, log, ...aborting, ...(options.speechPeaks === undefined ? {} : { peaks: options.speechPeaks }) });
|
|
67
67
|
const getSound = (clip) => sounds[clip.clip.id]?.file ?? clip.file;
|
|
68
68
|
const workDir = join(buildDir, "audio", "ranges");
|
|
69
69
|
for (const [index, range] of buying.entries()) {
|
|
@@ -124,11 +124,13 @@ async function runIsolateSpeechRanges(film, clips, edl, options, log) {
|
|
|
124
124
|
}
|
|
125
125
|
const speech = {};
|
|
126
126
|
const speechGainDb = {};
|
|
127
|
+
const speechPreGain = {};
|
|
127
128
|
for (const clip of clips) {
|
|
128
129
|
const id = clip.clip.id;
|
|
129
130
|
speech[id] = getSound(clip);
|
|
130
131
|
const clipGainDb = sounds[id]?.gainDb ?? 0;
|
|
131
132
|
speechGainDb[id] = clipGainDb;
|
|
133
|
+
speechPreGain[id] = sounds[id]?.preGain ?? { kind: "silent" };
|
|
132
134
|
const laidRanges = ranges.filter((range) => range.clip === id && range.laid);
|
|
133
135
|
if (laidRanges.length === 0)
|
|
134
136
|
continue;
|
|
@@ -153,7 +155,7 @@ async function runIsolateSpeechRanges(film, clips, edl, options, log) {
|
|
|
153
155
|
await runFfmpeg(`Laying the cleaned voice over clip ${id}`, buildRangeLayArgs(getSound(clip), laid, output, { fadeMs: options.fadeMs ?? DEFAULT_SPEECH_RANGE_FADE_MS }), { ...aborting, output });
|
|
154
156
|
speech[id] = output;
|
|
155
157
|
}
|
|
156
|
-
return ok({ speech, speechGainDb, ranges });
|
|
158
|
+
return ok({ speech, speechGainDb, speechPreGain, ranges });
|
|
157
159
|
}
|
|
158
160
|
/**
|
|
159
161
|
* 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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isolate-ranges.js","sourceRoot":"","sources":["../../src/footage/isolate-ranges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,uBAAuB,EAAwB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAkB,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5C,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAiE,MAAM,eAAe,CAAC;AAClH,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EAAE,WAAW,EAA0C,MAAM,gBAAgB,CAAC;AACrF,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,qBAAqB,EACrB,cAAc,EACd,mBAAmB,EACnB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,gBAAgB,EAChB,mBAAmB,EACnB,4BAA4B,GAK7B,MAAM,oBAAoB,CAAC;AA6B5B,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAC/C,MAAM,CAAC,MAAM,oCAAoC,GAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAkEpF;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAiB,EAAE,KAAqB,EAAE,GAAQ,EAAE,OAAmC;IACzH,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,GAAS,EAAE,CAAC,SAAS,CAAC,CAAC;IACnD,OAAO,0BAA0B,CAAC,kBAAkB,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAClK,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CACvD,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,KAAK,UAAU,sBAAsB,CACnC,IAAiB,EACjB,KAAqB,EACrB,GAAQ,EACR,OAAmC,EACnC,GAA2B;IAE3B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAChD,MAAM,QAAQ,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IACxD,MAAM,OAAO,GAAG,gBAAgB,CAC9B,GAAG,EACH,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAC1F,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAC7C,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC3C,MAAM,MAAM,GAA0B,EAAE,CAAC;IACzC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,IAAI,KAAK,SAAS;YAAE,SAAS;QACjC,IAAI,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACxD,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACrK,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YACrJ,SAAS;QACX,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IACnK,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAC3E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,SAAS,CAAC,SAAS,CAAC,UAAU,IAAI,CAAC,CAAC;QACpD,GAAG,CAAC,oBAAoB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,iBAAiB,SAAS,CAAC,SAAS,CAAC,EAAE,iBAAiB,MAAM,CAAC,OAAO,CAAC,kFAAkF,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3R,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACrG,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3F,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,MAAM,MAAM,GAAG,CAAC,KAAkB,EAAE,KAAa,EAAQ,EAAE;QACzD,OAAO,CAAC,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IAC5L,CAAC,CAAC;IACF,0HAA0H;IAC1H,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;IACzE,MAAM,QAAQ,GAAG,CAAC,IAAkB,EAAU,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;IACzF,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClD,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,IAAI,KAAK,SAAS;YAAE,SAAS;QACjC,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;QACnD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACrB,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxC,kEAAkE;QAClE,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACjG,MAAM,SAAS,CAAC,WAAW,aAAa,CAAC,KAAK,CAAC,sBAAsB,EAAE,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1J,MAAM,EAAE,cAAc,EAAE,CAAC;QACzB,GAAG,CAAC,oBAAoB,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,aAAa,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACpG,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;YACtC,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE;YAC1B,GAAG,QAAQ;YACX,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,EAAE;gBAC7C,MAAM,MAAM,GAAG,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,uBAAuB,CAAC,eAAe,CAAC,CAAC;gBAC3F,GAAG,CAAC,oBAAoB,aAAa,CAAC,KAAK,CAAC,qBAAqB,MAAM,CAAC,OAAO,CAAC,MAAM,MAAM,EAAE,CAAC,CAAC;YAClG,CAAC;SACF,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/B,KAAK,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC;YAC5H,IAAI,IAAI,KAAK,CAAC;YACd,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACrB,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,gHAAgH;QAChH,cAAc,CAAC,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7G,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,KAAK,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC9D,OAAO,CAAC,QAAQ,EAAE,CAAC;YACjB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI;YAC/C,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,EAAE;YAChC,KAAK;YACL,GAAG,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;YAChE,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE;SAChE,CAAC,CAAC;QACH,GAAG,CAAC,0BAA0B,KAAK,CAAC,IAAI,eAAe,CAAC,CAAC;QACzD,IAAI,IAAI,KAAK,CAAC;QACd,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IACzE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,GAAG,CAAC,oBAAoB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,6CAA6C,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IAC9E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9F,GAAG,CAAC,4BAA4B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,2EAA2E,CAAC,CAAC;IACpM,CAAC;IACD,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,MAAM,YAAY,GAA2B,EAAE,CAAC;IAChD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC;QAC3C,YAAY,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC;QAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7E,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACtC,MAAM,IAAI,GAAgB,EAAE,CAAC;QAC7B,KAAK,MAAM,MAAM,IAAI,qBAAqB,CAAC,UAAU,CAAC,EAAE,CAAC;YACvD,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC;YACzE,IAAI,KAAK,KAAK,SAAS;gBAAE,SAAS;YAClC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;YACxB,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,OAAO,GAAG,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,0BAA0B,IAAI,mBAAmB,MAAM,CAAC,KAAK,6BAA6B,CAAC,CAAC;YAC9I,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;YAChG,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,GAAG,WAAW,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;YACvE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACtB,IAAI,MAAM,KAAK,CAAC;gBAAE,GAAG,CAAC,oBAAoB,aAAa,CAAC,KAAK,CAAC,qCAAqC,MAAM,CAAC,WAAW,CAAC,wBAAwB,MAAM,CAAC,UAAU,CAAC,kBAAkB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACxM,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;QAC3D,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,MAAM,SAAS,CAAC,sCAAsC,EAAE,EAAE,EAAE,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,4BAA4B,EAAE,CAAC,EAAE,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAClM,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;IACtB,CAAC;IACD,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;AAC9C,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,oBAAoB,CAAC,KAA0B,EAAE,KAA2E;IACzI,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC,CAAC;IAC5C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS;QAAE,OAAO,UAAU,CAAC;IACpF,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACnE,IAAI,QAAQ,KAAK,IAAI;YAAE,OAAO,QAAQ,CAAC;IACzC,CAAC;IACD,IAAI,UAAU,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,wBAAwB,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAChJ,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,sBAAsB,EAAE,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzJ,OAAO,mBAAmB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAC;AACpE,CAAC;AAED,4IAA4I;AAC5I,KAAK,UAAU,oBAAoB,CAAC,KAAa,EAAE,IAAc,EAAE,MAA+B;IAChG,MAAM,IAAI,GAAG,aAAa,KAAK,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5G,IAAI,QAAQ,CAAC,IAAI,KAAK,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,2BAA2B,QAAQ,CAAC,KAAK,IAAI,CAAC,CAAC;IAC3G,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,4BAA4B,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnK,MAAM,WAAW,GAAG,uBAAuB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7D,IAAI,WAAW,KAAK,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,2CAA2C,CAAC,CAAC;IAC9F,OAAO,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;AAC3D,CAAC;AAID,mIAAmI;AACnI,KAAK,UAAU,kBAAkB,CAAC,KAMjC;IACC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,IAAI,6BAA6B,CAAC,CAAC,CAAC;IAC1F,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,IAAI,oCAAoC,CAAC;IACtE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,OAAO,CAAC;IACnC,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,eAAe,GAA2B,IAAI,CAAC;IACnD,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,QAAQ,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;QACxD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YAChB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;YAC1E,MAAM,EAAE,cAAc,EAAE,CAAC;QAC3B,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAChG,MAAM,EAAE,cAAc,EAAE,CAAC;QACzB,IAAI,OAAO,CAAC,EAAE;YAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;QACzF,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QACtB,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC;QAClD,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;QAC3C,IAAI,eAAe,EAAE,WAAW,KAAK,KAAK;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;IAC9G,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;AACzD,CAAC;AAED,qFAAqF;AACrF,KAAK,UAAU,OAAO,CAAC,EAAU,EAAE,MAAoB;IACrD,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,EAAE,cAAc,EAAE,CAAC;QACzB,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,KAAkB;IACvC,OAAO,QAAQ,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACxG,CAAC"}
|
|
1
|
+
{"version":3,"file":"isolate-ranges.js","sourceRoot":"","sources":["../../src/footage/isolate-ranges.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import type { BrandFont } from "../config/config.js";
|
|
|
4
4
|
import type { SfxEvent } from "../config/schema.js";
|
|
5
5
|
import { type HyperframesCapture } from "./hyperframes-capture.js";
|
|
6
6
|
import type { TimedWord } from "../voice/voiceover.js";
|
|
7
|
+
import { type SpeechPeaks, type SpeechPreGain } from "./clip-sound.js";
|
|
7
8
|
import { type FootageResult } from "./failure.js";
|
|
8
9
|
import { type FreeBytesReader } from "./disk.js";
|
|
9
10
|
import { type Edl } from "./edl.js";
|
|
@@ -59,6 +60,11 @@ export interface FootageRunOptions {
|
|
|
59
60
|
* person to run again. Every failure also gets one `log` line with the step and its full command.
|
|
60
61
|
*/
|
|
61
62
|
onFfmpegFailure?: FfmpegFailureHook;
|
|
63
|
+
/**
|
|
64
|
+
* How the clip sound's pre-gain treats a true peak above `SPEECH_PRE_GAIN.peakCeiling` (issue #1181): `ceiling`
|
|
65
|
+
* (default) stops the gain there; `float` reaches the target and writes the clip sound as 32-bit float.
|
|
66
|
+
*/
|
|
67
|
+
speechPeaks?: SpeechPeaks;
|
|
62
68
|
}
|
|
63
69
|
export interface PreparedClip {
|
|
64
70
|
clip: FootageClip;
|
|
@@ -85,6 +91,11 @@ export type TranscribeOutcome = {
|
|
|
85
91
|
* optional so an app's own `ready` outcome still compiles.
|
|
86
92
|
*/
|
|
87
93
|
speechGainDb?: Record<string, number>;
|
|
94
|
+
/**
|
|
95
|
+
* What each clip's pre-gain reached (`ClipSound.preGain`, issue #1181): `held_by_peak_ceiling` names a clip the
|
|
96
|
+
* speech chain hears under the target. Always answered; optional so an app's own `ready` outcome still compiles.
|
|
97
|
+
*/
|
|
98
|
+
speechPreGain?: Record<string, SpeechPreGain>;
|
|
88
99
|
};
|
|
89
100
|
export declare function getFrame(film: Pick<FootageFilm, "format">): Frame;
|
|
90
101
|
/** The ffmpeg failure reporting of a footage entry point: its `log` and its `onFfmpegFailure`. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/footage/pipeline.ts"],"names":[],"mappings":"AAIA,OAAO,EAA0B,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACrF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAG3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/footage/pipeline.ts"],"names":[],"mappings":"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"}
|
package/dist/footage/pipeline.js
CHANGED
|
@@ -170,19 +170,25 @@ async function decodeIsolatedVoice(cached, clipId, buildDir, signal) {
|
|
|
170
170
|
await runFfmpeg(`Decoding the cleaned voice of clip ${clipId}`, buildAudioArgs(cached, output), { ...(signal === undefined ? {} : { signal }), output });
|
|
171
171
|
return output;
|
|
172
172
|
}
|
|
173
|
-
/** Each clip's lossless, pre-gained sound (`prepareClipSounds`)
|
|
174
|
-
async function getClipSoundFiles(clips,
|
|
175
|
-
const
|
|
176
|
-
|
|
173
|
+
/** Each clip's lossless, pre-gained sound (`prepareClipSounds`), its pre-gain in dB and what it reached, by clip id. */
|
|
174
|
+
async function getClipSoundFiles(clips, options) {
|
|
175
|
+
const { buildDir, signal, speechPeaks, log } = options;
|
|
176
|
+
const sounds = Object.entries(await prepareClipSounds(clips, { buildDir, log, ...(signal === undefined ? {} : { signal }), ...(speechPeaks === undefined ? {} : { peaks: speechPeaks }) }));
|
|
177
|
+
return {
|
|
178
|
+
speech: Object.fromEntries(sounds.map(([id, sound]) => [id, sound.file])),
|
|
179
|
+
speechGainDb: Object.fromEntries(sounds.map(([id, sound]) => [id, sound.gainDb])),
|
|
180
|
+
speechPreGain: Object.fromEntries(sounds.map(([id, sound]) => [id, sound.preGain])),
|
|
181
|
+
};
|
|
177
182
|
}
|
|
178
183
|
/** The free transcripts of `--placeholder`, written under `placeholder/` for a look; the speech is each clip's lossless sound. */
|
|
179
|
-
async function transcribePlaceholder(clips,
|
|
184
|
+
async function transcribePlaceholder(clips, options) {
|
|
185
|
+
const { buildDir } = options;
|
|
180
186
|
const words = {};
|
|
181
187
|
for (const clip of clips) {
|
|
182
188
|
words[clip.clip.id] = clip.clip.role === "talk" ? makePlaceholderTranscript(clip.clip.script, clip.duration) : [];
|
|
183
189
|
writeTranscript(join(buildDir, "placeholder", `${clip.clip.id}.transcript.json`), words[clip.clip.id] ?? []);
|
|
184
190
|
}
|
|
185
|
-
return { kind: "ready", words, ...(await getClipSoundFiles(clips,
|
|
191
|
+
return { kind: "ready", words, ...(await getClipSoundFiles(clips, options)) };
|
|
186
192
|
}
|
|
187
193
|
/** The paid music step, when the film's music still has to be bought; null when it is cached or free. */
|
|
188
194
|
export function getMusicPaidStep(film, options, seconds) {
|
|
@@ -205,7 +211,7 @@ export function transcribeFootage(film, clips, options) {
|
|
|
205
211
|
async function runTranscribeFootage(film, clips, options) {
|
|
206
212
|
const { buildDir, providers, log, signal } = options;
|
|
207
213
|
if (options.isPlaceholder)
|
|
208
|
-
return ok(await transcribePlaceholder(clips,
|
|
214
|
+
return ok(await transcribePlaceholder(clips, options));
|
|
209
215
|
const keyTerms = getFilmKeyTerms(film);
|
|
210
216
|
if (!keyTerms.ok)
|
|
211
217
|
return err(`footage film ${film.id}: ${keyTerms.errors.join(" ")}`, { kind: "input" });
|
|
@@ -237,7 +243,7 @@ async function runTranscribeFootage(film, clips, options) {
|
|
|
237
243
|
for (const clip of clips)
|
|
238
244
|
words[clip.clip.id] = [];
|
|
239
245
|
// Every clip's sound, lossless and pre-gained: what the isolator, the speech to text and the speech track hear (#1139).
|
|
240
|
-
const { speech, speechGainDb } = await getClipSoundFiles(clips,
|
|
246
|
+
const { speech, speechGainDb, speechPreGain } = await getClipSoundFiles(clips, options);
|
|
241
247
|
const isolating = plan.filter(({ isolated }) => isolated !== null && !existsSync(isolated.path));
|
|
242
248
|
const transcribing = plan.filter(({ transcript }) => !existsSync(transcript.path));
|
|
243
249
|
const isolateProgress = createStageProgress(options.onProgress, "isolate", isolating.map(({ clip }) => ({ item: clip.clip.id, seconds: clip.duration })));
|
|
@@ -293,7 +299,7 @@ async function runTranscribeFootage(film, clips, options) {
|
|
|
293
299
|
transcribeProgress(index, clip.duration);
|
|
294
300
|
words[id] = result.value.words;
|
|
295
301
|
}
|
|
296
|
-
return ok({ kind: "ready", words, speech, speechGainDb });
|
|
302
|
+
return ok({ kind: "ready", words, speech, speechGainDb, speechPreGain });
|
|
297
303
|
}
|
|
298
304
|
/** The talking clips' sentences with their ids (`s1`…), as `buildEdl` names them, for choosing what to keep. */
|
|
299
305
|
export function getFootageSentences(clips, words) {
|