@softure-ai/marketing-kit 0.33.0 → 0.34.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 +23 -0
- package/README.md +13 -0
- package/dist/footage/camera.d.ts +67 -0
- package/dist/footage/camera.d.ts.map +1 -0
- package/dist/footage/camera.js +89 -0
- package/dist/footage/camera.js.map +1 -0
- package/dist/footage/compose.d.ts +6 -1
- package/dist/footage/compose.d.ts.map +1 -1
- package/dist/footage/compose.js +31 -9
- package/dist/footage/compose.js.map +1 -1
- package/dist/footage/draft-overlays.d.ts.map +1 -1
- package/dist/footage/draft-overlays.js +6 -5
- package/dist/footage/draft-overlays.js.map +1 -1
- package/dist/footage/draft.d.ts +10 -2
- package/dist/footage/draft.d.ts.map +1 -1
- package/dist/footage/draft.js +25 -28
- package/dist/footage/draft.js.map +1 -1
- package/dist/footage/edl.d.ts +23 -0
- package/dist/footage/edl.d.ts.map +1 -1
- package/dist/footage/edl.js +24 -0
- package/dist/footage/edl.js.map +1 -1
- package/dist/footage/overlay-html.d.ts.map +1 -1
- package/dist/footage/overlay-html.js +4 -1
- package/dist/footage/overlay-html.js.map +1 -1
- package/dist/footage/overlay-schema.d.ts +9 -2
- package/dist/footage/overlay-schema.d.ts.map +1 -1
- package/dist/footage/overlay-schema.js +16 -3
- package/dist/footage/overlay-schema.js.map +1 -1
- package/dist/footage/overlays.d.ts +2 -0
- package/dist/footage/overlays.d.ts.map +1 -1
- package/dist/footage/overlays.js +18 -5
- package/dist/footage/overlays.js.map +1 -1
- package/dist/footage/picture.d.ts +3 -0
- package/dist/footage/picture.d.ts.map +1 -1
- package/dist/footage/picture.js +15 -11
- package/dist/footage/picture.js.map +1 -1
- package/dist/index.d.ts +4 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/schema/edl.schema.json +70 -2
- package/src/footage/camera.ts +129 -0
- package/src/footage/compose.ts +30 -10
- package/src/footage/draft-overlays.ts +6 -5
- package/src/footage/draft.ts +29 -29
- package/src/footage/edl.ts +24 -0
- package/src/footage/overlay-html.ts +4 -1
- package/src/footage/overlay-schema.ts +22 -4
- package/src/footage/overlays.ts +27 -6
- package/src/footage/picture.ts +17 -11
- package/src/index.ts +24 -0
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,29 @@ 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.34.0
|
|
8
|
+
|
|
9
|
+
- **A segment's camera:** an EDL segment may carry `camera: { from, to, ease, seconds?, anchor? }`: its framing (1 is
|
|
10
|
+
the full frame, up to `MAX_CAMERA_SCALE` 1.6) and a slow move over it (a push-in, a pull-out, a settle that eases
|
|
11
|
+
back to the full frame), `linear` or `out` (`power1.out`), over the whole segment or its first `seconds`, about an
|
|
12
|
+
`anchor` (e.g. a face's centre; default 50 % across, 42 % down). The draft draws it with `zoompan` (a still framing
|
|
13
|
+
with a crop) about the anchor, the render with a GSAP tween and the anchor as `transform-origin` (per segment on the
|
|
14
|
+
one picture video). A cross-fade's outgoing tail is held at the zoom its camera reached. Refused beside a Ken Burns
|
|
15
|
+
zoom or a zoom cut (`validateEdl`); a camera move or a change of framing ends a shot for overlays, and a `punch_in`
|
|
16
|
+
on a camera segment is refused. An EDL without cameras renders exactly as before.
|
|
17
|
+
- **A fade's own length:** a `fade` segment may set `fadeFrames` (1-30, `MIN_FADE_FRAMES`, `MAX_FADE_FRAMES`) over the
|
|
18
|
+
film's `edit.fadeFrames`, in the draft, the picture and the render (`getSegmentFadeFrames`); refused on another cut.
|
|
19
|
+
- **New exports:** `cameraSchema`, `CAMERA_EASES`, `CAMERA_ORIGIN`, `MAX_CAMERA_SCALE`, `getCameraOrigin`,
|
|
20
|
+
`isCameraMoving`, `getCameraMoveFrames`, `getCameraMoveSeconds`, `getCameraGsapEase`, `getCameraScaleExpression`,
|
|
21
|
+
`getCameraScaleAt`, `toTransformOrigin`, `isSameCamera`, `describeCamera`, `getSegmentFadeFrames` and the types
|
|
22
|
+
`EdlCamera`, `CameraEase`, `CameraAnchor`. `diffEdl` names camera and fade length changes.
|
|
23
|
+
- **Keyword alignment:** `style.align` on a keyword (new `OVERLAY_KEYWORD_ALIGNS`, type `OverlayKeywordAlign`):
|
|
24
|
+
`left`, `center` or `right`, where its card sits across the room it may take, in place of `style.side` (a keyword
|
|
25
|
+
with both is refused). `center` puts the card in the middle with its text centred, in the render and the draft
|
|
26
|
+
alike, a typed entrance included (a resolved keyword carries `isCentred`); `getDrawnOverlayCard` answers it. A
|
|
27
|
+
keyword without either still sits on the right. A hook title or a place card keeps `center` or `left`; `right` on
|
|
28
|
+
one is refused by name. `EdlOverlayStyle.align` widens to `OverlayKeywordAlign`.
|
|
29
|
+
|
|
7
30
|
## 0.33.0
|
|
8
31
|
|
|
9
32
|
- **The list card grows with its points:** a list's first point now comes in with its card (a staggered list's
|
package/README.md
CHANGED
|
@@ -741,6 +741,11 @@ softure-marketing footage <film> --step=render # the EDL as it is, maybe e
|
|
|
741
741
|
wide shrinks like a title, at most three 10 % steps, else it is refused) or `auto` (chips when they fit one row, else
|
|
742
742
|
the stack). A resolved list carries `isCentred` or `chips` (each chip's box); `getDrawnOverlayCard` answers the
|
|
743
743
|
row's box, `getListCardsByItem` the drawn boxes after each point and `getListItemTimes` each point's second.
|
|
744
|
+
- **Keyword alignment** (0.34.0): a keyword takes `style.align` (`OVERLAY_KEYWORD_ALIGNS`: `left`, `center` or
|
|
745
|
+
`right`) in place of `style.side`: its card on the left, in the middle of the room it may take (its text centred,
|
|
746
|
+
also while it types in) or on the right; giving both is refused. Without either it stays on the right. A resolved
|
|
747
|
+
keyword carries `isCentred`, and `getDrawnOverlayCard` answers the card where it is drawn. A title still aligns its
|
|
748
|
+
lines `center` or `left` only.
|
|
744
749
|
- **Transitions and look:** `jump` (a cut inside one talking clip) and `clip` (between clips) are hard cuts by
|
|
745
750
|
default; `zoom` punches in by `edit.zoomPercent` (105-112, default 108) and back out on the next, `fade` lasts
|
|
746
751
|
`edit.fadeFrames` (default 10 at 30 fps), `whoosh` is a cut with the `sfx.whoosh` sound. B-roll stays still unless
|
|
@@ -764,6 +769,14 @@ softure-marketing footage <film> --step=render # the EDL as it is, maybe e
|
|
|
764
769
|
"transitions": { "jump": "auto", "clip": "fade" },
|
|
765
770
|
"edit": { "zoomPercent": 110, "zoomEaseFrames": 4, "fadeFrames": 5, "cutAudioFadeMs": 40, "cutAudioCrossfade": true }
|
|
766
771
|
```
|
|
772
|
+
- **A segment's camera:** an EDL segment may carry `camera: { from, to, ease, seconds?, anchor? }` (`camera.ts`):
|
|
773
|
+
the framing it is shown at (1 is the full frame, up to `MAX_CAMERA_SCALE` 1.6) and a slow move over it, a push-in
|
|
774
|
+
(`from` below `to`), a pull-out or a settle (`from` above `to`); `ease` `linear` keeps one speed, `out` slows down
|
|
775
|
+
(`power1.out`); `seconds` ends the move early and holds; `anchor` (fractions of the frame, e.g. the face's centre) is
|
|
776
|
+
the point the zoom keeps still, so the crop never leaves the source frame. The draft (`zoompan` or a crop about the
|
|
777
|
+
anchor) and the render (a GSAP tween with the anchor as `transform-origin`) draw it alike; captions and overlays are
|
|
778
|
+
drawn over the moved picture. A camera is refused beside a Ken Burns zoom or a zoom cut, ends a shot for overlays
|
|
779
|
+
(`findShotBreak`) and takes no `punch_in`. A `fade` segment may set its own `fadeFrames` (1-30) over the film's.
|
|
767
780
|
- **Music:** `file` (local), `prompt` (ElevenLabs Music, instrumental, the film's length) or `fromVideo` (ElevenLabs
|
|
768
781
|
Video to Music, scored to the cut itself, with `description` and `tags`). Generated music is paid and cached the same
|
|
769
782
|
way. It plays at `volume` and ducks to `duckedVolume` while someone speaks, from the word times, with a fade in and out;
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
/**
|
|
3
|
+
* A segment's camera: the framing it is shown at and a slow move over it, drawn alike by the draft (ffmpeg `zoompan`
|
|
4
|
+
* about the anchor) and the render (a GSAP scale tween with the anchor as `transform-origin`). Captions and overlays
|
|
5
|
+
* are drawn over the moved picture, so a move never moves them.
|
|
6
|
+
*
|
|
7
|
+
* - A still framing: `from` equal to `to` (1 is the full frame, 1.5 a tight crop).
|
|
8
|
+
* - A push-in: `from` below `to`; a pull-out or a settle: `from` above `to`.
|
|
9
|
+
* - `ease`: `linear` keeps one speed (a slow drift); `out` slows down to its end (`power1.out`, `1 - (1 - t)^2`).
|
|
10
|
+
* - `seconds`: how long the move takes from the segment's start, then the picture holds; absent: the whole segment.
|
|
11
|
+
* - `anchor`: the point of the frame the zoom keeps still (fractions of the frame; a face's centre keeps the face in
|
|
12
|
+
* the picture); absent: the kit's zoom origin (`CAMERA_ORIGIN`). The crop never leaves the source frame.
|
|
13
|
+
*/
|
|
14
|
+
export interface EdlCamera {
|
|
15
|
+
from: number;
|
|
16
|
+
to: number;
|
|
17
|
+
ease: CameraEase;
|
|
18
|
+
seconds?: number;
|
|
19
|
+
anchor?: CameraAnchor;
|
|
20
|
+
}
|
|
21
|
+
export declare const CAMERA_EASES: readonly ["linear", "out"];
|
|
22
|
+
export type CameraEase = (typeof CAMERA_EASES)[number];
|
|
23
|
+
export interface CameraAnchor {
|
|
24
|
+
x: number;
|
|
25
|
+
y: number;
|
|
26
|
+
}
|
|
27
|
+
/** The point a zoom keeps still when it names none: the composition's `transform-origin: 50% 42%`. */
|
|
28
|
+
export declare const CAMERA_ORIGIN: CameraAnchor;
|
|
29
|
+
/** The tightest framing a camera may take: past it a 1080x1920 source shows its pixels. */
|
|
30
|
+
export declare const MAX_CAMERA_SCALE = 1.6;
|
|
31
|
+
export declare const cameraSchema: z.ZodObject<{
|
|
32
|
+
from: z.ZodNumber;
|
|
33
|
+
to: z.ZodNumber;
|
|
34
|
+
ease: z.ZodEnum<{
|
|
35
|
+
linear: "linear";
|
|
36
|
+
out: "out";
|
|
37
|
+
}>;
|
|
38
|
+
seconds: z.ZodOptional<z.ZodNumber>;
|
|
39
|
+
anchor: z.ZodOptional<z.ZodObject<{
|
|
40
|
+
x: z.ZodNumber;
|
|
41
|
+
y: z.ZodNumber;
|
|
42
|
+
}, z.core.$strict>>;
|
|
43
|
+
}, z.core.$strict>;
|
|
44
|
+
/** The point a camera keeps still. */
|
|
45
|
+
export declare function getCameraOrigin(camera: Pick<EdlCamera, "anchor"> | undefined): CameraAnchor;
|
|
46
|
+
/** Whether a camera changes its scale over the segment (a still framing does not). */
|
|
47
|
+
export declare function isCameraMoving(camera: EdlCamera | undefined): boolean;
|
|
48
|
+
/** The frames a camera's move takes: its `seconds` (or the segment's length), at most the segment's frames, at least one. */
|
|
49
|
+
export declare function getCameraMoveFrames(camera: EdlCamera, segmentSeconds: number): number;
|
|
50
|
+
/** The camera's move in seconds, as the render's tween plays it (`getCameraMoveFrames` in film frames). */
|
|
51
|
+
export declare function getCameraMoveSeconds(camera: EdlCamera, segmentSeconds: number): number;
|
|
52
|
+
/** The GSAP ease of a camera's move: `none` for `linear`, `power1.out` (`1 - (1 - t)^2`) for `out`. */
|
|
53
|
+
export declare function getCameraGsapEase(ease: CameraEase): string;
|
|
54
|
+
/** The camera's scale as an ffmpeg expression of the segment's frame number `variable`, as the render's tween eases it. */
|
|
55
|
+
export declare function getCameraScaleExpression(camera: EdlCamera, frames: number, variable?: string): string;
|
|
56
|
+
/** The camera's scale `frame` frames into its segment, as the draft's expression and the render's tween give it. */
|
|
57
|
+
export declare function getCameraScaleAt(camera: EdlCamera, frames: number, frame: number): number;
|
|
58
|
+
/** The anchor as a CSS `transform-origin`. */
|
|
59
|
+
export declare function toTransformOrigin(anchor: CameraAnchor): string;
|
|
60
|
+
/**
|
|
61
|
+
* Whether two cameras show the same framing: both the full frame, still (absent, or `from` and `to` 1), or the same
|
|
62
|
+
* scales, ease, length and anchor.
|
|
63
|
+
*/
|
|
64
|
+
export declare function isSameCamera(a: EdlCamera | undefined, b: EdlCamera | undefined): boolean;
|
|
65
|
+
/** A camera in a few words, for `diffEdl` ("push 1 → 1.15 linear"). */
|
|
66
|
+
export declare function describeCamera(camera: EdlCamera | undefined): string;
|
|
67
|
+
//# sourceMappingURL=camera.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"camera.d.ts","sourceRoot":"","sources":["../../src/footage/camera.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB;AAED,eAAO,MAAM,YAAY,YAAI,QAAQ,EAAE,KAAK,CAAU,CAAC;AAEvD,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,WAAW,YAAY;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,sGAAsG;AACtG,eAAO,MAAM,aAAa,EAAE,YAAkC,CAAC;AAE/D,2FAA2F;AAC3F,eAAO,MAAM,gBAAgB,MAAM,CAAC;AAIpC,eAAO,MAAM,YAAY;;;;;;;;;;;;kBAc+G,CAAC;AAIzI,sCAAsC;AACtC,wBAAgB,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,SAAS,GAAG,YAAY,CAE3F;AAED,sFAAsF;AACtF,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAErE;AAED,6HAA6H;AAC7H,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAGrF;AAED,2GAA2G;AAC3G,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAEtF;AAED,uGAAuG;AACvG,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAE1D;AAED,2HAA2H;AAC3H,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,SAAO,GAAG,MAAM,CAKnG;AAED,oHAAoH;AACpH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAIzF;AAED,8CAA8C;AAC9C,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAE9D;AAOD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAKxF;AAED,uEAAuE;AACvE,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,MAAM,CAMpE"}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
import { FOOTAGE_FPS } from "./normalize.js";
|
|
3
|
+
export const CAMERA_EASES = ["linear", "out"];
|
|
4
|
+
/** The point a zoom keeps still when it names none: the composition's `transform-origin: 50% 42%`. */
|
|
5
|
+
export const CAMERA_ORIGIN = { x: 0.5, y: 0.42 };
|
|
6
|
+
/** The tightest framing a camera may take: past it a 1080x1920 source shows its pixels. */
|
|
7
|
+
export const MAX_CAMERA_SCALE = 1.6;
|
|
8
|
+
const scaleSchema = z.number().min(1).max(MAX_CAMERA_SCALE);
|
|
9
|
+
export const cameraSchema = z
|
|
10
|
+
.strictObject({
|
|
11
|
+
from: scaleSchema.describe(`The scale the segment starts at: 1 is the full frame, up to ${String(MAX_CAMERA_SCALE)}.`),
|
|
12
|
+
to: scaleSchema.describe("The scale it ends at; equal to from: a still framing."),
|
|
13
|
+
ease: z.enum(CAMERA_EASES).describe("linear: one steady speed; out: slows down to its end."),
|
|
14
|
+
seconds: z.number().positive().max(120).optional().describe("How long the move takes from the segment's start, then the picture holds; absent: the whole segment."),
|
|
15
|
+
anchor: z
|
|
16
|
+
.strictObject({
|
|
17
|
+
x: z.number().min(0).max(1).describe("Across the frame, 0 (left) to 1 (right)."),
|
|
18
|
+
y: z.number().min(0).max(1).describe("Down the frame, 0 (top) to 1 (bottom)."),
|
|
19
|
+
})
|
|
20
|
+
.optional()
|
|
21
|
+
.describe("The point the zoom keeps still, such as the face's centre; absent: 50 % across, 42 % down."),
|
|
22
|
+
})
|
|
23
|
+
.describe("The segment's framing and a slow move over it (a push-in, a pull-out, a settle); drawn alike by the draft and the render.");
|
|
24
|
+
const r4 = (value) => Math.round(value * 10000) / 10000 || 0;
|
|
25
|
+
/** The point a camera keeps still. */
|
|
26
|
+
export function getCameraOrigin(camera) {
|
|
27
|
+
return camera?.anchor ?? CAMERA_ORIGIN;
|
|
28
|
+
}
|
|
29
|
+
/** Whether a camera changes its scale over the segment (a still framing does not). */
|
|
30
|
+
export function isCameraMoving(camera) {
|
|
31
|
+
return camera !== undefined && camera.from !== camera.to;
|
|
32
|
+
}
|
|
33
|
+
/** The frames a camera's move takes: its `seconds` (or the segment's length), at most the segment's frames, at least one. */
|
|
34
|
+
export function getCameraMoveFrames(camera, segmentSeconds) {
|
|
35
|
+
const segmentFrames = Math.max(1, Math.round(segmentSeconds * FOOTAGE_FPS));
|
|
36
|
+
return Math.max(1, Math.min(segmentFrames, Math.round((camera.seconds ?? segmentSeconds) * FOOTAGE_FPS)));
|
|
37
|
+
}
|
|
38
|
+
/** The camera's move in seconds, as the render's tween plays it (`getCameraMoveFrames` in film frames). */
|
|
39
|
+
export function getCameraMoveSeconds(camera, segmentSeconds) {
|
|
40
|
+
return Math.round((getCameraMoveFrames(camera, segmentSeconds) / FOOTAGE_FPS) * 1000) / 1000;
|
|
41
|
+
}
|
|
42
|
+
/** The GSAP ease of a camera's move: `none` for `linear`, `power1.out` (`1 - (1 - t)^2`) for `out`. */
|
|
43
|
+
export function getCameraGsapEase(ease) {
|
|
44
|
+
return ease === "linear" ? "none" : "power1.out";
|
|
45
|
+
}
|
|
46
|
+
/** The camera's scale as an ffmpeg expression of the segment's frame number `variable`, as the render's tween eases it. */
|
|
47
|
+
export function getCameraScaleExpression(camera, frames, variable = "on") {
|
|
48
|
+
if (!isCameraMoving(camera))
|
|
49
|
+
return String(camera.from);
|
|
50
|
+
const progress = `min(${variable}/${String(frames)},1)`;
|
|
51
|
+
const eased = camera.ease === "linear" ? progress : `(1-pow(1-${progress},2))`;
|
|
52
|
+
return `${String(camera.from)}+(${String(r4(camera.to - camera.from))})*${eased}`;
|
|
53
|
+
}
|
|
54
|
+
/** The camera's scale `frame` frames into its segment, as the draft's expression and the render's tween give it. */
|
|
55
|
+
export function getCameraScaleAt(camera, frames, frame) {
|
|
56
|
+
const t = Math.min(Math.max(frame / frames, 0), 1);
|
|
57
|
+
const eased = camera.ease === "linear" ? t : 1 - (1 - t) ** 2;
|
|
58
|
+
return r4(camera.from + (camera.to - camera.from) * eased);
|
|
59
|
+
}
|
|
60
|
+
/** The anchor as a CSS `transform-origin`. */
|
|
61
|
+
export function toTransformOrigin(anchor) {
|
|
62
|
+
return `${String(r4(anchor.x * 100))}% ${String(r4(anchor.y * 100))}%`;
|
|
63
|
+
}
|
|
64
|
+
/** Whether a camera shows the full frame, still: drawn as no camera at all. */
|
|
65
|
+
function isFullFrame(camera) {
|
|
66
|
+
return camera === undefined || (camera.from === 1 && camera.to === 1);
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Whether two cameras show the same framing: both the full frame, still (absent, or `from` and `to` 1), or the same
|
|
70
|
+
* scales, ease, length and anchor.
|
|
71
|
+
*/
|
|
72
|
+
export function isSameCamera(a, b) {
|
|
73
|
+
if (isFullFrame(a) && isFullFrame(b))
|
|
74
|
+
return true;
|
|
75
|
+
if (a === undefined || b === undefined)
|
|
76
|
+
return false;
|
|
77
|
+
const [pa, pb] = [getCameraOrigin(a), getCameraOrigin(b)];
|
|
78
|
+
return a.from === b.from && a.to === b.to && a.ease === b.ease && a.seconds === b.seconds && pa.x === pb.x && pa.y === pb.y;
|
|
79
|
+
}
|
|
80
|
+
/** A camera in a few words, for `diffEdl` ("push 1 → 1.15 linear"). */
|
|
81
|
+
export function describeCamera(camera) {
|
|
82
|
+
if (camera === undefined)
|
|
83
|
+
return "none";
|
|
84
|
+
const kind = camera.from === camera.to ? "framing" : camera.from < camera.to ? "push" : "pull";
|
|
85
|
+
const scales = camera.from === camera.to ? String(camera.from) : `${String(camera.from)} → ${String(camera.to)} ${camera.ease}`;
|
|
86
|
+
const anchor = camera.anchor === undefined ? "" : ` at ${String(r4(camera.anchor.x))},${String(r4(camera.anchor.y))}`;
|
|
87
|
+
return `${kind} ${scales}${camera.seconds === undefined ? "" : ` over ${String(camera.seconds)} s`}${anchor}`;
|
|
88
|
+
}
|
|
89
|
+
//# sourceMappingURL=camera.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"camera.js","sourceRoot":"","sources":["../../src/footage/camera.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,8 +59,13 @@ export interface FootageComposeInput {
|
|
|
59
59
|
}
|
|
60
60
|
/** The film's length: the cut plus the end card (`getEndCardSeconds`). */
|
|
61
61
|
export declare function getFootageFilmSeconds(film: Pick<FootageFilm, "endCard">, edl: Edl): number;
|
|
62
|
-
/**
|
|
62
|
+
/**
|
|
63
|
+
* The picture scale each segment starts at: `zoom` cuts alternate between punched in (`zoomPercent`) and back out; a
|
|
64
|
+
* segment with a `camera` starts at its camera's `from`.
|
|
65
|
+
*/
|
|
63
66
|
export declare function getSegmentScales(edl: Edl, zoomPercent?: number): number[];
|
|
67
|
+
/** The frames a segment's cut cross-fades over: its own `fadeFrames` or the film's on a `fade` after the first segment, else 0. */
|
|
68
|
+
export declare function getSegmentFadeFrames(edl: Pick<Edl, "segments">, index: number, edit: Pick<FootageEdit, "fadeFrames">): number;
|
|
64
69
|
/**
|
|
65
70
|
* The frames each segment's zoom eases over (`zoomEaseFrames`, at most the segment's own frames): a `zoom` cut after
|
|
66
71
|
* the first segment that changes the scale and is not `kenburns` (its slow zoom owns the scale); 0 for every other.
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/footage/compose.ts"],"names":[],"mappings":"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"}
|
package/dist/footage/compose.js
CHANGED
|
@@ -2,6 +2,7 @@ import { assertLocalReferences, escapeHtml, fontFaces, fontStack } from "../comp
|
|
|
2
2
|
import { CAPTION_LINE_HEIGHT, getCaptionPillCss, getCaptionPositionCss } from "../compose/timeline.js";
|
|
3
3
|
import { CAPTION_HIGHLIGHT_BOX_PADDING_EM, CAPTION_HIGHLIGHT_BOX_RADIUS, CAPTION_HIGHLIGHT_SECONDS, CAPTION_UNDERLINE_EM, getCaptionEntranceTween, getCaptionHighlight } from "./caption-highlight.js";
|
|
4
4
|
import { CAPTION_SAFE_ZONES, getCaptionChunkLayouts, getCaptionSpans, getFootageCaptionChunks, isSameCaptionPlace } from "./captions.js";
|
|
5
|
+
import { getCameraGsapEase, getCameraMoveSeconds, getCameraOrigin, isCameraMoving, toTransformOrigin } from "./camera.js";
|
|
5
6
|
import { getEdlDuration, getSegmentStarts } from "./edl.js";
|
|
6
7
|
import { CAPTION_MIN_FONT_SCALE, DEFAULT_EDIT, DEFAULT_END_CARD_SECONDS, DEFAULT_LOGO_END_CARD_FADE_SECONDS, getEndCardSeconds, getFootageEdit, } from "./film.js";
|
|
7
8
|
import { FOOTAGE_FPS } from "./normalize.js";
|
|
@@ -32,15 +33,28 @@ const LOGO_CARD_MARK = { width: 720, height: 480 };
|
|
|
32
33
|
export function getFootageFilmSeconds(film, edl) {
|
|
33
34
|
return r3(getEdlDuration(edl) + getEndCardSeconds(film.endCard));
|
|
34
35
|
}
|
|
35
|
-
/**
|
|
36
|
+
/**
|
|
37
|
+
* The picture scale each segment starts at: `zoom` cuts alternate between punched in (`zoomPercent`) and back out; a
|
|
38
|
+
* segment with a `camera` starts at its camera's `from`.
|
|
39
|
+
*/
|
|
36
40
|
export function getSegmentScales(edl, zoomPercent = DEFAULT_EDIT.zoomPercent) {
|
|
37
41
|
const scales = [];
|
|
38
42
|
edl.segments.forEach((segment, index) => {
|
|
39
43
|
const previous = scales[index - 1] ?? 1;
|
|
40
|
-
|
|
44
|
+
if (segment.camera !== undefined)
|
|
45
|
+
scales.push(segment.camera.from);
|
|
46
|
+
else
|
|
47
|
+
scales.push(segment.transition === "zoom" && index > 0 ? (previous === 1 ? zoomPercent / 100 : 1) : 1);
|
|
41
48
|
});
|
|
42
49
|
return scales;
|
|
43
50
|
}
|
|
51
|
+
/** The frames a segment's cut cross-fades over: its own `fadeFrames` or the film's on a `fade` after the first segment, else 0. */
|
|
52
|
+
export function getSegmentFadeFrames(edl, index, edit) {
|
|
53
|
+
const segment = edl.segments[index];
|
|
54
|
+
if (segment === undefined || index === 0 || segment.transition !== "fade")
|
|
55
|
+
return 0;
|
|
56
|
+
return segment.fadeFrames ?? edit.fadeFrames;
|
|
57
|
+
}
|
|
44
58
|
/**
|
|
45
59
|
* The frames each segment's zoom eases over (`zoomEaseFrames`, at most the segment's own frames): a `zoom` cut after
|
|
46
60
|
* the first segment that changes the scale and is not `kenburns` (its slow zoom owns the scale); 0 for every other.
|
|
@@ -48,7 +62,7 @@ export function getSegmentScales(edl, zoomPercent = DEFAULT_EDIT.zoomPercent) {
|
|
|
48
62
|
export function getSegmentZoomEases(edl, edit) {
|
|
49
63
|
const scales = getSegmentScales(edl, edit.zoomPercent);
|
|
50
64
|
return edl.segments.map((segment, index) => {
|
|
51
|
-
const isEased = edit.zoomEaseFrames > 0 && index > 0 && segment.transition === "zoom" && segment.motion !== "kenburns" && scales[index - 1] !== scales[index];
|
|
65
|
+
const isEased = edit.zoomEaseFrames > 0 && index > 0 && segment.transition === "zoom" && segment.motion !== "kenburns" && segment.camera === undefined && scales[index - 1] !== scales[index];
|
|
52
66
|
return isEased ? Math.max(1, Math.min(edit.zoomEaseFrames, Math.floor((segment.end - segment.start) * FOOTAGE_FPS))) : 0;
|
|
53
67
|
});
|
|
54
68
|
}
|
|
@@ -87,7 +101,10 @@ export function composeFootage(input) {
|
|
|
87
101
|
const edit = getFootageEdit(film);
|
|
88
102
|
const scales = getSegmentScales(edl, edit.zoomPercent);
|
|
89
103
|
const eases = getSegmentZoomEases(edl, edit);
|
|
90
|
-
const
|
|
104
|
+
const fadeSecondsAt = (index) => r3(getSegmentFadeFrames(edl, index, edit) / FOOTAGE_FPS);
|
|
105
|
+
// A film with a camera anchors its zooms per segment; one without keeps the stylesheet's origin (and its markup).
|
|
106
|
+
const hasCamera = edl.segments.some((segment) => segment.camera !== undefined);
|
|
107
|
+
const originOf = (segment) => toTransformOrigin(getCameraOrigin(segment.camera));
|
|
91
108
|
const kenBurnsScale = 1 + (edit.kenBurnsPercent > 0 ? edit.kenBurnsPercent : HAND_KEN_BURNS_PERCENT) / 100;
|
|
92
109
|
const picture = assets.picture;
|
|
93
110
|
const segments = picture === undefined
|
|
@@ -95,12 +112,12 @@ export function composeFootage(input) {
|
|
|
95
112
|
const src = assets.clips[segment.clip];
|
|
96
113
|
if (src === undefined)
|
|
97
114
|
throw new Error(`The EDL names clip "${segment.clip}", which the film has no file for.`);
|
|
98
|
-
const
|
|
99
|
-
const tail = next?.transition === "fade" ? fadeSeconds : 0;
|
|
115
|
+
const tail = fadeSecondsAt(index + 1);
|
|
100
116
|
const start = starts[index];
|
|
101
117
|
const duration = r3(segment.end - segment.start + tail);
|
|
102
118
|
const scale = scales[index];
|
|
103
|
-
const
|
|
119
|
+
const origin = segment.camera === undefined ? "" : `;transform-origin:${originOf(segment)}`;
|
|
120
|
+
const style = scale === 1 && origin === "" ? "" : ` style="transform:scale(${scale})${origin}"`;
|
|
104
121
|
return `<video id="seg${index}" class="clip shot" src="${escapeHtml(src)}" data-start="${start}" data-media-start="${segment.start}" data-duration="${duration}"${style} muted playsinline></video>`;
|
|
105
122
|
})
|
|
106
123
|
: [`<video id="picture" class="clip shot" src="${escapeHtml(picture)}" data-start="0" data-media-start="0" data-duration="${cutEnd}" muted playsinline></video>`];
|
|
@@ -111,9 +128,14 @@ export function composeFootage(input) {
|
|
|
111
128
|
const target = picture === undefined ? `#seg${index}` : "#picture";
|
|
112
129
|
// One video carries every segment: each one sets the zoom it starts at (a fade is already in the picture).
|
|
113
130
|
if (picture !== undefined)
|
|
114
|
-
tweens.push(`tl.set("#picture", { scale: ${scale} }, ${start});`);
|
|
131
|
+
tweens.push(hasCamera ? `tl.set("#picture", { scale: ${scale}, transformOrigin: "${originOf(segment)}" }, ${start});` : `tl.set("#picture", { scale: ${scale} }, ${start});`);
|
|
115
132
|
if (picture === undefined && segment.transition === "fade" && index > 0) {
|
|
116
|
-
tweens.push(`tl.fromTo("${target}", { opacity: 0 }, { opacity: 1, duration: ${
|
|
133
|
+
tweens.push(`tl.fromTo("${target}", { opacity: 0 }, { opacity: 1, duration: ${fadeSecondsAt(index)}, ease: "none", immediateRender: false }, ${start});`);
|
|
134
|
+
}
|
|
135
|
+
const { camera } = segment;
|
|
136
|
+
if (camera !== undefined && isCameraMoving(camera)) {
|
|
137
|
+
const seconds = getCameraMoveSeconds(camera, segment.end - segment.start);
|
|
138
|
+
tweens.push(`tl.fromTo("${target}", { scale: ${camera.from} }, { scale: ${camera.to}, duration: ${seconds}, ease: "${getCameraGsapEase(camera.ease)}", immediateRender: false }, ${start});`);
|
|
117
139
|
}
|
|
118
140
|
const ease = eases[index];
|
|
119
141
|
if (ease > 0) {
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draft-overlays.d.ts","sourceRoot":"","sources":["../../src/footage/draft-overlays.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGzF,OAAO,EAA0E,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAc/H,OAAO,EAkBL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,eAAe,EACrB,MAAM,eAAe,CAAC;AA8BvB,0HAA0H;AAC1H,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,MAAM,EAAE,CAOrF;AAcD,wGAAwG;AACxG,wBAAgB,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAY3F;AAED,oHAAoH;AACpH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAY/H;AAUD,kHAAkH;AAClH,wBAAgB,aAAa,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMpE;AAED,iFAAiF;AACjF,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAQtE;AAED,UAAU,YAAY;IACpB,KAAK,EAAE,aAAa,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,gEAAgE;IAChE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,qHAAqH;IACrH,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;CAAE,EAAE,GAAG,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAG9L;
|
|
1
|
+
{"version":3,"file":"draft-overlays.d.ts","sourceRoot":"","sources":["../../src/footage/draft-overlays.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGzF,OAAO,EAA0E,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAc/H,OAAO,EAkBL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,eAAe,EACrB,MAAM,eAAe,CAAC;AA8BvB,0HAA0H;AAC1H,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,MAAM,EAAE,CAOrF;AAcD,wGAAwG;AACxG,wBAAgB,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAY3F;AAED,oHAAoH;AACpH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAY/H;AAUD,kHAAkH;AAClH,wBAAgB,aAAa,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMpE;AAED,iFAAiF;AACjF,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAQtE;AAED,UAAU,YAAY;IACpB,KAAK,EAAE,aAAa,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,gEAAgE;IAChE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,qHAAqH;IACrH,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;CAAE,EAAE,GAAG,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAG9L;AAueD;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,SAAS,eAAe,EAAE,EACpC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACxC,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,UAAU,CAAA;CAAO,GACtG,MAAM,EAAE,CAQV"}
|
|
@@ -310,19 +310,20 @@ function getSideTextEvents(overlay, context) {
|
|
|
310
310
|
// A side text always has a card: only a punch_in has none.
|
|
311
311
|
const card = getDrawnOverlayCard(overlay);
|
|
312
312
|
const { x: padX, y: padY } = getOverlayPadding(overlay);
|
|
313
|
-
const
|
|
314
|
-
const
|
|
313
|
+
const isCentred = overlay.kind === "keyword" && overlay.isCentred === true;
|
|
314
|
+
const isRight = !isCentred && side === "right";
|
|
315
|
+
const x = isCentred ? card.left + card.width / 2 : isRight ? card.left + card.width - padX : card.left + padX;
|
|
315
316
|
const isFoot = overlay.kind === "lower_third";
|
|
316
317
|
const y = isFoot ? card.top + card.height - padY : card.top + padY;
|
|
317
|
-
// \an: 7 top left, 9 top right, 1 bottom left, 3 bottom right.
|
|
318
|
-
const align = isFoot ? (isRight ? 3 : 1) : isRight ? 9 : 7;
|
|
318
|
+
// \an: 7 top left, 8 top centre, 9 top right, 1 bottom left, 3 bottom right.
|
|
319
|
+
const align = isFoot ? (isRight ? 3 : 1) : isCentred ? 8 : isRight ? 9 : 7;
|
|
319
320
|
const motion = getDraftMotion(overlay, overlay.entrance === null || overlay.entrance === "type" ? "fade" : overlay.entrance, card, context);
|
|
320
321
|
const span = { start: overlay.start, end: overlay.end };
|
|
321
322
|
const tags = `\\an${align}\\fs${fontSize}${getTextTags(overlay, colors, context, OVERLAY_FONT_ROLES[overlay.kind])}`;
|
|
322
323
|
const text = (pos, steps, own = motion) => getTextEvents({ layer: 4, style: "OverlayPlain", pos, tags, steps, motion: own });
|
|
323
324
|
const shape = getCardShapeEvents(overlay, card, fontSize, colors, motion, context);
|
|
324
325
|
// A keyword or a lower third types in only when its entrance says so.
|
|
325
|
-
const steps = overlay.entrance === null ? [{ from: span.start, to: span.end, text: toAssText(overlay.text) }] : getTypedSteps(overlay.text, span, overlay.typing);
|
|
326
|
+
const steps = overlay.entrance === null ? [{ from: span.start, to: span.end, text: toAssText(overlay.text) }] : getTypedSteps(overlay.text, span, overlay.typing, isCentred);
|
|
326
327
|
return [...shape, ...text({ x, y }, steps), ...(overlay.kind === "keyword" ? getUnderlineEvent(overlay, card, colors.accent, motion) : [])];
|
|
327
328
|
}
|
|
328
329
|
/** A list's card grows to its next point's size over these seconds, in this many steps along the render's ease. */
|