@thunderkiller/video-clipper 1.9.0 → 1.10.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/dist/app/web/lib/captionTemplates.d.ts +3 -0
- package/dist/app/web/lib/captionTemplates.d.ts.map +1 -0
- package/dist/app/web/lib/captionTemplates.js +98 -0
- package/dist/app/web/lib/captionTemplates.js.map +1 -0
- package/dist/app/web/lib/format.d.ts +2 -0
- package/dist/app/web/lib/format.d.ts.map +1 -1
- package/dist/app/web/lib/format.js +20 -0
- package/dist/app/web/lib/format.js.map +1 -1
- package/dist/app/web/lib/services/artifacts/artifactStore.d.ts +9 -0
- package/dist/app/web/lib/services/artifacts/artifactStore.d.ts.map +1 -1
- package/dist/app/web/lib/services/artifacts/artifactStore.js +45 -0
- package/dist/app/web/lib/services/artifacts/artifactStore.js.map +1 -1
- package/dist/app/web/lib/services/clipping/clipEditService.d.ts +12 -0
- package/dist/app/web/lib/services/clipping/clipEditService.d.ts.map +1 -0
- package/dist/app/web/lib/services/clipping/clipEditService.js +73 -0
- package/dist/app/web/lib/services/clipping/clipEditService.js.map +1 -0
- package/dist/app/web/lib/services/clipping/clipService.d.ts.map +1 -1
- package/dist/app/web/lib/services/clipping/clipService.js +25 -3
- package/dist/app/web/lib/services/clipping/clipService.js.map +1 -1
- package/dist/app/web/lib/services/publishing/draftService.d.ts +1 -0
- package/dist/app/web/lib/services/publishing/draftService.d.ts.map +1 -1
- package/dist/app/web/lib/services/publishing/draftService.js +58 -7
- package/dist/app/web/lib/services/publishing/draftService.js.map +1 -1
- package/dist/app/web/lib/services/publishing/uploadService.js +4 -3
- package/dist/app/web/lib/services/publishing/uploadService.js.map +1 -1
- package/dist/app/web/lib/services/subtitles/subtitlePlanService.d.ts +5 -0
- package/dist/app/web/lib/services/subtitles/subtitlePlanService.d.ts.map +1 -0
- package/dist/app/web/lib/services/subtitles/subtitlePlanService.js +113 -0
- package/dist/app/web/lib/services/subtitles/subtitlePlanService.js.map +1 -0
- package/dist/app/web/lib/{configStore.d.ts → stores/config.d.ts} +2 -2
- package/dist/app/web/lib/{configStore.d.ts.map → stores/config.d.ts.map} +1 -1
- package/dist/app/web/lib/{configStore.js → stores/config.js} +3 -3
- package/dist/app/web/lib/stores/config.js.map +1 -0
- package/dist/app/web/lib/{toastStore.d.ts → stores/toast.d.ts} +2 -2
- package/dist/app/web/lib/{toastStore.d.ts.map → stores/toast.d.ts.map} +1 -1
- package/dist/app/web/lib/{toastStore.js → stores/toast.js} +1 -1
- package/dist/app/web/lib/{toastStore.js.map → stores/toast.js.map} +1 -1
- package/dist/app/web/lib/stores/video.d.ts +12 -0
- package/dist/app/web/lib/stores/video.d.ts.map +1 -0
- package/dist/app/web/lib/stores/video.js +65 -0
- package/dist/app/web/lib/stores/video.js.map +1 -0
- package/dist/app/web/lib/subtitleTiming.d.ts +5 -0
- package/dist/app/web/lib/subtitleTiming.d.ts.map +1 -0
- package/dist/app/web/lib/subtitleTiming.js +45 -0
- package/dist/app/web/lib/subtitleTiming.js.map +1 -0
- package/dist/app/web/routes/api/clips/[clipId]/edits/+server.d.ts +4 -0
- package/dist/app/web/routes/api/clips/[clipId]/edits/+server.d.ts.map +1 -0
- package/dist/app/web/routes/api/clips/[clipId]/edits/+server.js +61 -0
- package/dist/app/web/routes/api/clips/[clipId]/edits/+server.js.map +1 -0
- package/dist/app/web/routes/api/clips/[clipId]/file/+server.d.ts +3 -0
- package/dist/app/web/routes/api/clips/[clipId]/file/+server.d.ts.map +1 -0
- package/dist/app/web/routes/api/clips/[clipId]/file/+server.js +99 -0
- package/dist/app/web/routes/api/clips/[clipId]/file/+server.js.map +1 -0
- package/dist/app/web/routes/api/clips/[clipId]/render/+server.d.ts +3 -0
- package/dist/app/web/routes/api/clips/[clipId]/render/+server.d.ts.map +1 -0
- package/dist/app/web/routes/api/clips/[clipId]/render/+server.js +31 -0
- package/dist/app/web/routes/api/clips/[clipId]/render/+server.js.map +1 -0
- package/dist/app/web/routes/api/clips/[clipId]/subtitles/plan/+server.d.ts +3 -0
- package/dist/app/web/routes/api/clips/[clipId]/subtitles/plan/+server.d.ts.map +1 -0
- package/dist/app/web/routes/api/clips/[clipId]/subtitles/plan/+server.js +25 -0
- package/dist/app/web/routes/api/clips/[clipId]/subtitles/plan/+server.js.map +1 -0
- package/dist/app/web/routes/api/publish/drafts/[analysisId]/+server.d.ts.map +1 -1
- package/dist/app/web/routes/api/publish/drafts/[analysisId]/+server.js +2 -5
- package/dist/app/web/routes/api/publish/drafts/[analysisId]/+server.js.map +1 -1
- package/dist/app/web/types/analysis.d.ts +13 -0
- package/dist/app/web/types/analysis.d.ts.map +1 -1
- package/dist/app/web/types/analysis.js +8 -0
- package/dist/app/web/types/analysis.js.map +1 -1
- package/dist/app/web/types/componentProps.d.ts +159 -1
- package/dist/app/web/types/componentProps.d.ts.map +1 -1
- package/dist/app/web/types/publish.d.ts +8 -0
- package/dist/app/web/types/publish.d.ts.map +1 -1
- package/dist/app/web/types/publish.js +2 -0
- package/dist/app/web/types/publish.js.map +1 -1
- package/dist/app/web/types/subtitlePlan.d.ts +46 -0
- package/dist/app/web/types/subtitlePlan.d.ts.map +1 -0
- package/dist/app/web/types/subtitlePlan.js +20 -0
- package/dist/app/web/types/subtitlePlan.js.map +1 -0
- package/dist/app/web/types/videoStore.d.ts +13 -0
- package/dist/app/web/types/videoStore.d.ts.map +1 -0
- package/dist/app/web/types/videoStore.js +2 -0
- package/dist/app/web/types/videoStore.js.map +1 -0
- package/dist/lib/services/video/clipper/editor/drawtextBuilder.d.ts +6 -0
- package/dist/lib/services/video/clipper/editor/drawtextBuilder.d.ts.map +1 -0
- package/dist/lib/services/video/clipper/editor/drawtextBuilder.js +42 -0
- package/dist/lib/services/video/clipper/editor/drawtextBuilder.js.map +1 -0
- package/dist/lib/services/video/clipper/editor/filterGraphBuilder.d.ts +7 -0
- package/dist/lib/services/video/clipper/editor/filterGraphBuilder.d.ts.map +1 -0
- package/dist/lib/services/video/clipper/editor/filterGraphBuilder.js +58 -0
- package/dist/lib/services/video/clipper/editor/filterGraphBuilder.js.map +1 -0
- package/dist/lib/services/video/clipper/editor/renderer.d.ts +4 -0
- package/dist/lib/services/video/clipper/editor/renderer.d.ts.map +1 -0
- package/dist/lib/services/video/clipper/editor/renderer.js +83 -0
- package/dist/lib/services/video/clipper/editor/renderer.js.map +1 -0
- package/dist/lib/services/video/clipper/editor/subtitleBuilder.d.ts +6 -0
- package/dist/lib/services/video/clipper/editor/subtitleBuilder.d.ts.map +1 -0
- package/dist/lib/services/video/clipper/editor/subtitleBuilder.js +155 -0
- package/dist/lib/services/video/clipper/editor/subtitleBuilder.js.map +1 -0
- package/dist/lib/services/video/clipper/editor/textEscape.d.ts +3 -0
- package/dist/lib/services/video/clipper/editor/textEscape.d.ts.map +1 -0
- package/dist/lib/services/video/clipper/editor/textEscape.js +11 -0
- package/dist/lib/services/video/clipper/editor/textEscape.js.map +1 -0
- package/dist/lib/services/video/clipper/index.d.ts +9 -0
- package/dist/lib/services/video/clipper/index.d.ts.map +1 -1
- package/dist/lib/services/video/clipper/index.js +20 -8
- package/dist/lib/services/video/clipper/index.js.map +1 -1
- package/dist/lib/types/clipEdit.d.ts +232 -0
- package/dist/lib/types/clipEdit.d.ts.map +1 -0
- package/dist/lib/types/clipEdit.js +68 -0
- package/dist/lib/types/clipEdit.js.map +1 -0
- package/dist/lib/types/config.d.ts +2 -1
- package/dist/lib/types/config.d.ts.map +1 -1
- package/dist/lib/types/config.js +6 -0
- package/dist/lib/types/config.js.map +1 -1
- package/dist/lib/types/index.d.ts +2 -0
- package/dist/lib/types/index.d.ts.map +1 -1
- package/dist/lib/types/index.js +1 -0
- package/dist/lib/types/index.js.map +1 -1
- package/dist/lib/utils/textScale.d.ts +14 -0
- package/dist/lib/utils/textScale.d.ts.map +1 -0
- package/dist/lib/utils/textScale.js +14 -0
- package/dist/lib/utils/textScale.js.map +1 -0
- package/package.json +3 -1
- package/dist/app/web/lib/configStore.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"videoStore.js","sourceRoot":"","sources":["../../../../src/app/web/types/videoStore.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"drawtextBuilder.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/services/video/clipper/editor/drawtextBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAI1D,wBAAgB,aAAa,CAC3B,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACzC,YAAY,GAAE,MAAU,GACvB,MAAM,CA0CR"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { resolveRenderedFontSize } from '../../../../utils/textScale.js';
|
|
2
|
+
import { escapeDrawtext } from './textEscape.js';
|
|
3
|
+
export function buildDrawtext(overlay, output, trimStartSec = 0) {
|
|
4
|
+
const xPx = Math.round(overlay.position.xCenter * output.width);
|
|
5
|
+
const yPx = Math.round(overlay.position.yCenter * output.height);
|
|
6
|
+
const renderedSize = resolveRenderedFontSize(overlay.style.fontSize, output);
|
|
7
|
+
// Mirror the canvas transform: translate(-50%, -50%) for center, (0, -50%) for left,
|
|
8
|
+
// (-100%, -50%) for right — so xCenter is always the semantic anchor.
|
|
9
|
+
let xExpr;
|
|
10
|
+
if (overlay.style.align === 'left') {
|
|
11
|
+
xExpr = `${xPx}`;
|
|
12
|
+
}
|
|
13
|
+
else if (overlay.style.align === 'right') {
|
|
14
|
+
xExpr = `(${xPx}-tw)`;
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
xExpr = `(${xPx}-tw/2)`;
|
|
18
|
+
}
|
|
19
|
+
// Shift the enable window into the output (trimmed) timeline so the overlay
|
|
20
|
+
// appears at the correct time relative to the 0-based output video.
|
|
21
|
+
const enableStart = Math.max(0, overlay.startSec - trimStartSec);
|
|
22
|
+
const enableEnd = Math.max(0, overlay.endSec - trimStartSec);
|
|
23
|
+
const parts = [
|
|
24
|
+
`text='${escapeDrawtext(overlay.text)}'`,
|
|
25
|
+
`enable='between(t,${enableStart},${enableEnd})'`,
|
|
26
|
+
`x=${xExpr}`,
|
|
27
|
+
`y=(${yPx}-th/2)`,
|
|
28
|
+
`fontsize=${renderedSize}`,
|
|
29
|
+
`fontcolor=${overlay.style.color}`,
|
|
30
|
+
];
|
|
31
|
+
if (overlay.style.outlineColor !== null) {
|
|
32
|
+
parts.push(`borderw=${overlay.style.outlineWidth}`);
|
|
33
|
+
parts.push(`bordercolor=${overlay.style.outlineColor}`);
|
|
34
|
+
}
|
|
35
|
+
if (overlay.style.bgColor !== null) {
|
|
36
|
+
parts.push(`box=1`);
|
|
37
|
+
parts.push(`boxcolor=${overlay.style.bgColor}`);
|
|
38
|
+
parts.push(`boxborderw=${overlay.style.bgPaddingX}`);
|
|
39
|
+
}
|
|
40
|
+
return `drawtext=${parts.join(':')}`;
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=drawtextBuilder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"drawtextBuilder.js","sourceRoot":"","sources":["../../../../../../src/lib/services/video/clipper/editor/drawtextBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,UAAU,aAAa,CAC3B,OAAoB,EACpB,MAAyC,EACzC,eAAuB,CAAC;IAExB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAChE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IACjE,MAAM,YAAY,GAAG,uBAAuB,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE7E,qFAAqF;IACrF,sEAAsE;IACtE,IAAI,KAAa,CAAC;IAClB,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;QACnC,KAAK,GAAG,GAAG,GAAG,EAAE,CAAC;IACnB,CAAC;SAAM,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;QAC3C,KAAK,GAAG,IAAI,GAAG,MAAM,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,IAAI,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,4EAA4E;IAC5E,oEAAoE;IACpE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,GAAG,YAAY,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC;IAE7D,MAAM,KAAK,GAAa;QACtB,SAAS,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG;QACxC,qBAAqB,WAAW,IAAI,SAAS,IAAI;QACjD,KAAK,KAAK,EAAE;QACZ,MAAM,GAAG,QAAQ;QACjB,YAAY,YAAY,EAAE;QAC1B,aAAa,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE;KACnC,CAAC;IAEF,IAAI,OAAO,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;QACxC,KAAK,CAAC,IAAI,CAAC,WAAW,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;QACpD,KAAK,CAAC,IAAI,CAAC,eAAe,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QACnC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,YAAY,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAChD,KAAK,CAAC,IAAI,CAAC,cAAc,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,YAAY,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AACvC,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { ClipEdits, FilterGraphResult } from '../../../../types/clipEdit.js';
|
|
2
|
+
export declare function buildFilterGraph(edits: ClipEdits, srcMeta: {
|
|
3
|
+
width: number;
|
|
4
|
+
height: number;
|
|
5
|
+
fps: number;
|
|
6
|
+
}, assPath: string | null): FilterGraphResult;
|
|
7
|
+
//# sourceMappingURL=filterGraphBuilder.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filterGraphBuilder.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/services/video/clipper/editor/filterGraphBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAS3E,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EACvD,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,iBAAiB,CA8BnB"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { buildDrawtext } from './drawtextBuilder.js';
|
|
2
|
+
const RESOLUTIONS = {
|
|
3
|
+
'16:9': { w: 1920, h: 1080 },
|
|
4
|
+
'9:16': { w: 1080, h: 1920 },
|
|
5
|
+
'1:1': { w: 1080, h: 1080 },
|
|
6
|
+
};
|
|
7
|
+
export function buildFilterGraph(edits, srcMeta, assPath) {
|
|
8
|
+
const { w: oW, h: oH } = RESOLUTIONS[edits.viewport.preset];
|
|
9
|
+
const segments = [];
|
|
10
|
+
let labelN = 0;
|
|
11
|
+
const reframeResult = buildReframe(edits, srcMeta, oW, oH, labelN);
|
|
12
|
+
segments.push(reframeResult.filter);
|
|
13
|
+
labelN = reframeResult.nextN;
|
|
14
|
+
for (const overlay of edits.overlays) {
|
|
15
|
+
const inLabel = `[v${labelN - 1}]`;
|
|
16
|
+
const outLabel = `[v${labelN}]`;
|
|
17
|
+
segments.push(`${inLabel}${buildDrawtext(overlay, { width: oW, height: oH }, edits.trim.startSec)}${outLabel}`);
|
|
18
|
+
labelN++;
|
|
19
|
+
}
|
|
20
|
+
if (assPath !== null && edits.subtitles.length > 0) {
|
|
21
|
+
const inLabel = `[v${labelN - 1}]`;
|
|
22
|
+
const outLabel = `[v${labelN}]`;
|
|
23
|
+
const escapedPath = assPath.replace(/:/g, '\\:');
|
|
24
|
+
segments.push(`${inLabel}subtitles='${escapedPath}'${outLabel}`);
|
|
25
|
+
labelN++;
|
|
26
|
+
}
|
|
27
|
+
const mapLabel = `[v${labelN - 1}]`;
|
|
28
|
+
const filterComplex = segments.join(';');
|
|
29
|
+
return { filterComplex, mapLabel };
|
|
30
|
+
}
|
|
31
|
+
function buildReframe(edits, srcMeta, oW, oH, n) {
|
|
32
|
+
const { fillMode, focus } = edits.viewport;
|
|
33
|
+
const outLabel = `[v${n}]`;
|
|
34
|
+
if (fillMode === 'crop') {
|
|
35
|
+
const cropX = Math.max(0, Math.min(srcMeta.width - oW, Math.round(focus.xCenter * srcMeta.width - oW / 2)));
|
|
36
|
+
const cropY = Math.max(0, Math.min(srcMeta.height - oH, Math.round(focus.yCenter * srcMeta.height - oH / 2)));
|
|
37
|
+
return {
|
|
38
|
+
filter: `[0:v]crop=${oW}:${oH}:${cropX}:${cropY}${outLabel}`,
|
|
39
|
+
nextN: n + 1,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
if (fillMode === 'pad-blur') {
|
|
43
|
+
const bgLabel = `[bg${n}]`;
|
|
44
|
+
const fgLabel = `[fg${n}]`;
|
|
45
|
+
const filter = [
|
|
46
|
+
`[0:v]scale=${oW}:${oH}:force_original_aspect_ratio=decrease,boxblur=20${bgLabel}`,
|
|
47
|
+
`[0:v]scale=${oW}:-2:force_original_aspect_ratio=decrease${fgLabel}`,
|
|
48
|
+
`${bgLabel}${fgLabel}overlay=(W-w)/2:(H-h)/2${outLabel}`,
|
|
49
|
+
].join(';');
|
|
50
|
+
return { filter, nextN: n + 1 };
|
|
51
|
+
}
|
|
52
|
+
// pad-black
|
|
53
|
+
return {
|
|
54
|
+
filter: `[0:v]scale=${oW}:-2:force_original_aspect_ratio=decrease,pad=${oW}:${oH}:(ow-iw)/2:(oh-ih)/2:black${outLabel}`,
|
|
55
|
+
nextN: n + 1,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
//# sourceMappingURL=filterGraphBuilder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filterGraphBuilder.js","sourceRoot":"","sources":["../../../../../../src/lib/services/video/clipper/editor/filterGraphBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { ClipEdits } from '../../../../types/clipEdit.js';
|
|
2
|
+
import type { ClipperConfig } from '../../../../types/video.js';
|
|
3
|
+
export declare function renderClipWithEdits(inputPath: string, edits: ClipEdits, outputPath: string, cfg: ClipperConfig): Promise<string>;
|
|
4
|
+
//# sourceMappingURL=renderer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/services/video/clipper/editor/renderer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAmCzD,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,SAAS,EAChB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,MAAM,CAAC,CAgEjB"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import ffmpeg from 'fluent-ffmpeg';
|
|
2
|
+
import { promises as fs } from 'fs';
|
|
3
|
+
import { join } from 'path';
|
|
4
|
+
import { configureFfmpeg } from '../../../../services/video/clipper/index.js';
|
|
5
|
+
import { buildAss } from './subtitleBuilder.js';
|
|
6
|
+
import { buildFilterGraph } from './filterGraphBuilder.js';
|
|
7
|
+
const RESOLUTIONS = {
|
|
8
|
+
'16:9': { w: 1920, h: 1080 },
|
|
9
|
+
'9:16': { w: 1080, h: 1920 },
|
|
10
|
+
'1:1': { w: 1080, h: 1080 },
|
|
11
|
+
};
|
|
12
|
+
function probeVideo(filePath) {
|
|
13
|
+
return new Promise((resolve, reject) => {
|
|
14
|
+
ffmpeg.ffprobe(filePath, (err, data) => {
|
|
15
|
+
if (err)
|
|
16
|
+
return reject(err);
|
|
17
|
+
const videoStream = data.streams.find((s) => s.codec_type === 'video');
|
|
18
|
+
if (!videoStream)
|
|
19
|
+
return reject(new Error('No video stream found in ' + filePath));
|
|
20
|
+
const width = videoStream.width ?? 1920;
|
|
21
|
+
const height = videoStream.height ?? 1080;
|
|
22
|
+
let fps = 30;
|
|
23
|
+
const avgFr = videoStream.avg_frame_rate;
|
|
24
|
+
if (avgFr && avgFr !== '0/0') {
|
|
25
|
+
const parts = avgFr.split('/');
|
|
26
|
+
const num = parseFloat(parts[0]);
|
|
27
|
+
const den = parseFloat(parts[1] ?? '1');
|
|
28
|
+
if (den > 0)
|
|
29
|
+
fps = num / den;
|
|
30
|
+
}
|
|
31
|
+
resolve({ width, height, fps });
|
|
32
|
+
});
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
export async function renderClipWithEdits(inputPath, edits, outputPath, cfg) {
|
|
36
|
+
configureFfmpeg(cfg);
|
|
37
|
+
await probeVideo(inputPath);
|
|
38
|
+
const { w: oW, h: oH } = RESOLUTIONS[edits.viewport.preset];
|
|
39
|
+
let assPath = null;
|
|
40
|
+
if (edits.subtitles.length > 0) {
|
|
41
|
+
const tmpDir = join(cfg.outputDir, 'web', 'clip-edits', 'tmp');
|
|
42
|
+
await fs.mkdir(tmpDir, { recursive: true });
|
|
43
|
+
assPath = join(tmpDir, `${edits.clipId}.ass`);
|
|
44
|
+
const assContent = buildAss(edits.subtitles, { width: oW, height: oH }, edits.trim.startSec);
|
|
45
|
+
await fs.writeFile(assPath, assContent, 'utf-8');
|
|
46
|
+
}
|
|
47
|
+
const { filterComplex, mapLabel } = buildFilterGraph(edits, { width: oW, height: oH, fps: 30 }, assPath);
|
|
48
|
+
return new Promise((resolve, reject) => {
|
|
49
|
+
ffmpeg(inputPath)
|
|
50
|
+
.inputOptions(['-ss', String(edits.trim.startSec), '-to', String(edits.trim.endSec)])
|
|
51
|
+
.complexFilter(filterComplex)
|
|
52
|
+
.outputOptions([
|
|
53
|
+
'-map',
|
|
54
|
+
mapLabel,
|
|
55
|
+
'-map',
|
|
56
|
+
'0:a?',
|
|
57
|
+
'-c:v',
|
|
58
|
+
'libx264',
|
|
59
|
+
'-preset',
|
|
60
|
+
cfg.ffmpegPreset,
|
|
61
|
+
'-c:a',
|
|
62
|
+
'aac',
|
|
63
|
+
'-movflags',
|
|
64
|
+
'+faststart',
|
|
65
|
+
])
|
|
66
|
+
.output(outputPath)
|
|
67
|
+
.on('end', () => resolve(outputPath))
|
|
68
|
+
.on('error', (err, _stdout, stderr) => {
|
|
69
|
+
const msg = stderr ?? err.message;
|
|
70
|
+
if (/No such filter: 'subtitles'|No option name near.*\.ass/i.test(msg)) {
|
|
71
|
+
return reject(new Error('ffmpeg is missing libass — the subtitles filter is not available. ' +
|
|
72
|
+
'On macOS the default `ffmpeg` Homebrew formula is minimal — install `ffmpeg-full` (`brew install ffmpeg-full`) and point FFMPEG_PATH / FFPROBE_PATH at `/usr/local/opt/ffmpeg-full/bin/{ffmpeg,ffprobe}`.'));
|
|
73
|
+
}
|
|
74
|
+
if (/No such filter: 'drawtext'/i.test(msg)) {
|
|
75
|
+
return reject(new Error('ffmpeg is missing libfreetype — the drawtext filter is not available. ' +
|
|
76
|
+
'Reinstall ffmpeg with libfreetype support (e.g. `brew reinstall ffmpeg`).'));
|
|
77
|
+
}
|
|
78
|
+
reject(err);
|
|
79
|
+
})
|
|
80
|
+
.run();
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=renderer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../../../../src/lib/services/video/clipper/editor/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subtitleBuilder.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/services/video/clipper/editor/subtitleBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAyC3D,wBAAgB,QAAQ,CACtB,SAAS,EAAE,YAAY,EAAE,EACzB,MAAM,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACzC,YAAY,GAAE,MAAU,GACvB,MAAM,CA0CR"}
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
import { resolveRenderedFontSize } from '../../../../utils/textScale.js';
|
|
2
|
+
import { escapeAss } from './textEscape.js';
|
|
3
|
+
function cssToAssColor(hex) {
|
|
4
|
+
const h = hex.replace('#', '');
|
|
5
|
+
const rr = h.slice(0, 2);
|
|
6
|
+
const gg = h.slice(2, 4);
|
|
7
|
+
const bb = h.slice(4, 6);
|
|
8
|
+
return `&H00${bb}${gg}${rr}`.toUpperCase();
|
|
9
|
+
}
|
|
10
|
+
function secToAssTime(sec) {
|
|
11
|
+
const h = Math.floor(sec / 3600);
|
|
12
|
+
const m = Math.floor((sec % 3600) / 60);
|
|
13
|
+
const s = Math.floor(sec % 60);
|
|
14
|
+
const cs = Math.round((sec - Math.floor(sec)) * 100);
|
|
15
|
+
return `${h}:${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}.${String(cs).padStart(2, '0')}`;
|
|
16
|
+
}
|
|
17
|
+
/** Map style.align to ASS numpad alignment (bottom row: 1=left, 2=center, 3=right). */
|
|
18
|
+
function alignToAssCode(align) {
|
|
19
|
+
if (align === 'left')
|
|
20
|
+
return 1;
|
|
21
|
+
if (align === 'right')
|
|
22
|
+
return 3;
|
|
23
|
+
return 2; // center
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Canvas uses `width: 90%` centered, so the text block has 5% margins on each side.
|
|
27
|
+
* Mirror those margins in ASS so left/right aligned text matches the canvas anchor.
|
|
28
|
+
*/
|
|
29
|
+
function alignMargins(align, outputWidth) {
|
|
30
|
+
const margin = Math.round(0.05 * outputWidth);
|
|
31
|
+
if (align === 'left')
|
|
32
|
+
return { marginL: margin, marginR: 0 };
|
|
33
|
+
if (align === 'right')
|
|
34
|
+
return { marginL: 0, marginR: margin };
|
|
35
|
+
return { marginL: 0, marginR: 0 };
|
|
36
|
+
}
|
|
37
|
+
export function buildAss(subtitles, output, trimStartSec = 0) {
|
|
38
|
+
if (subtitles.length === 0) {
|
|
39
|
+
return (buildHeader(output) +
|
|
40
|
+
'\n[Events]\nFormat: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\n');
|
|
41
|
+
}
|
|
42
|
+
const styleLines = subtitles.map((sub) => {
|
|
43
|
+
const sc = sub.style;
|
|
44
|
+
const pc = cssToAssColor(sc.color);
|
|
45
|
+
const oc = sc.outlineColor ? cssToAssColor(sc.outlineColor) : '&H00000000';
|
|
46
|
+
const bc = sc.bgColor ? cssToAssColor(sc.bgColor) : '&H00000000';
|
|
47
|
+
const b = sc.weight >= 600 ? -1 : 0;
|
|
48
|
+
const marginV = Math.round((1 - sub.position.yCenter) * output.height);
|
|
49
|
+
const renderedSize = resolveRenderedFontSize(sc.fontSize, output);
|
|
50
|
+
const alignment = alignToAssCode(sc.align);
|
|
51
|
+
const { marginL, marginR } = alignMargins(sc.align, output.width);
|
|
52
|
+
// BorderStyle=3 renders an opaque background box; Outline field becomes box padding.
|
|
53
|
+
// BorderStyle=1 renders text outline (normal mode).
|
|
54
|
+
const borderStyle = sc.bgColor ? 3 : 1;
|
|
55
|
+
const outlineField = sc.bgColor ? sc.bgPaddingX : sc.outlineWidth;
|
|
56
|
+
return `Style: ${sub.id},${sc.fontFamily},${renderedSize},${pc},&H00FFFFFF,${oc},${bc},${b},0,0,0,100,100,0,0,${borderStyle},${outlineField},0,${alignment},${marginL},${marginR},${marginV},1`;
|
|
57
|
+
});
|
|
58
|
+
// Each subtitle may produce multiple dialogue events (one per word window + gaps)
|
|
59
|
+
// so that exactly the currently-playing word is shown in highlightColor and all
|
|
60
|
+
// others revert to style.color — matching the canvas activeWordIndex behaviour.
|
|
61
|
+
const dialogueLines = subtitles.flatMap((sub) => buildWordEvents(sub, output, trimStartSec));
|
|
62
|
+
const lines = [
|
|
63
|
+
buildHeader(output),
|
|
64
|
+
'[V4+ Styles]',
|
|
65
|
+
'Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding',
|
|
66
|
+
...styleLines,
|
|
67
|
+
'',
|
|
68
|
+
'[Events]',
|
|
69
|
+
'Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text',
|
|
70
|
+
...dialogueLines,
|
|
71
|
+
];
|
|
72
|
+
return lines.join('\n') + '\n';
|
|
73
|
+
}
|
|
74
|
+
function buildHeader(output) {
|
|
75
|
+
return [
|
|
76
|
+
'[Script Info]',
|
|
77
|
+
'ScriptType: v4.00+',
|
|
78
|
+
`PlayResX: ${output.width}`,
|
|
79
|
+
`PlayResY: ${output.height}`,
|
|
80
|
+
'WrapStyle: 0',
|
|
81
|
+
'',
|
|
82
|
+
].join('\n');
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Build one or more ASS Dialogue events for a subtitle line.
|
|
86
|
+
*
|
|
87
|
+
* Strategy: generate a separate event for each word's active time window, with only
|
|
88
|
+
* that word overridden to highlightColor (\\1c). All other words use the style's
|
|
89
|
+
* PrimaryColour (= style.color) by having no override. Gap periods between/around
|
|
90
|
+
* words also get an event showing all words in the base colour.
|
|
91
|
+
*
|
|
92
|
+
* This is the only reliable way to match the canvas behaviour (activeWordIndex) in
|
|
93
|
+
* libass: \\1c is a static text-position override and cannot be made time-dependent
|
|
94
|
+
* within a single dialogue event, so a per-word-window event approach is required.
|
|
95
|
+
*
|
|
96
|
+
* All timestamps are shifted by trimStartSec so they reference the output video's
|
|
97
|
+
* 0-based timeline rather than the original clip's absolute timeline.
|
|
98
|
+
*/
|
|
99
|
+
function buildWordEvents(sub, output, trimStartSec) {
|
|
100
|
+
const marginV = Math.round((1 - sub.position.yCenter) * output.height);
|
|
101
|
+
const { marginL, marginR } = alignMargins(sub.style.align, output.width);
|
|
102
|
+
// Shift subtitle window into the output (trimmed) timeline.
|
|
103
|
+
// Clamp the start to ≥ 0 — a subtitle that began before the trim start
|
|
104
|
+
// will simply begin at the first frame of the output.
|
|
105
|
+
const subStart = Math.max(0, sub.startSec - trimStartSec);
|
|
106
|
+
const subEnd = Math.max(0, sub.endSec - trimStartSec);
|
|
107
|
+
// Skip subtitles that fall entirely outside the output window.
|
|
108
|
+
if (subStart >= subEnd)
|
|
109
|
+
return [];
|
|
110
|
+
const makeEvent = (startSec, endSec, text) => `Dialogue: 0,${secToAssTime(startSec)},${secToAssTime(endSec)},${sub.id},,${marginL},${marginR},${marginV},,${text}`;
|
|
111
|
+
// No word timing: single event for the full duration, plain text.
|
|
112
|
+
if (sub.words.length === 0) {
|
|
113
|
+
return [makeEvent(subStart, subEnd, escapeAss(sub.text))];
|
|
114
|
+
}
|
|
115
|
+
const highlightColor = cssToAssColor(sub.style.highlightColor);
|
|
116
|
+
/** All words joined in the style's base colour (no override tags). */
|
|
117
|
+
const allBase = () => sub.words.map((w) => escapeAss(w.text)).join(' ');
|
|
118
|
+
/**
|
|
119
|
+
* Build text for the window when word[activeIdx] is playing:
|
|
120
|
+
* – words before activeIdx: no override → PrimaryColour (base)
|
|
121
|
+
* – word[activeIdx]: \\1c{highlightColor} … \\r resets to base after
|
|
122
|
+
* – words after activeIdx: no override → PrimaryColour (base)
|
|
123
|
+
*/
|
|
124
|
+
const withActive = (activeIdx) => sub.words
|
|
125
|
+
.map((w, i) => {
|
|
126
|
+
const escaped = escapeAss(w.text);
|
|
127
|
+
if (i === activeIdx)
|
|
128
|
+
return `{\\1c${highlightColor}}${escaped}{\\r}`;
|
|
129
|
+
return escaped;
|
|
130
|
+
})
|
|
131
|
+
.join(' ');
|
|
132
|
+
const events = [];
|
|
133
|
+
let cursor = subStart;
|
|
134
|
+
for (let wi = 0; wi < sub.words.length; wi++) {
|
|
135
|
+
const word = sub.words[wi];
|
|
136
|
+
// Offset word timestamps and clamp to the subtitle's (already-shifted) window.
|
|
137
|
+
const wordStart = Math.max(subStart, word.startSec - trimStartSec);
|
|
138
|
+
const wordEnd = Math.min(subEnd, word.endSec - trimStartSec);
|
|
139
|
+
if (wordStart >= wordEnd)
|
|
140
|
+
continue; // word outside the output window — skip
|
|
141
|
+
// Gap before this word: all words in base colour.
|
|
142
|
+
if (wordStart > cursor) {
|
|
143
|
+
events.push(makeEvent(cursor, wordStart, allBase()));
|
|
144
|
+
}
|
|
145
|
+
// Word active window: only this word in highlightColor.
|
|
146
|
+
events.push(makeEvent(wordStart, wordEnd, withActive(wi)));
|
|
147
|
+
cursor = wordEnd;
|
|
148
|
+
}
|
|
149
|
+
// Gap after the last word (or if no words overlapped the subtitle window).
|
|
150
|
+
if (cursor < subEnd) {
|
|
151
|
+
events.push(makeEvent(cursor, subEnd, allBase()));
|
|
152
|
+
}
|
|
153
|
+
return events;
|
|
154
|
+
}
|
|
155
|
+
//# sourceMappingURL=subtitleBuilder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subtitleBuilder.js","sourceRoot":"","sources":["../../../../../../src/lib/services/video/clipper/editor/subtitleBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"textEscape.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/services/video/clipper/editor/textEscape.ts"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM9C"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export function escapeDrawtext(text) {
|
|
2
|
+
return text.replace(/\\/g, '\\\\').replace(/:/g, '\\:').replace(/'/g, "\\'").replace(/%/g, '\\%');
|
|
3
|
+
}
|
|
4
|
+
export function escapeAss(text) {
|
|
5
|
+
return text
|
|
6
|
+
.replace(/\\/g, '\\\\')
|
|
7
|
+
.replace(/\{/g, '\\{')
|
|
8
|
+
.replace(/\}/g, '\\}')
|
|
9
|
+
.replace(/\n/g, '\\N');
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=textEscape.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"textEscape.js","sourceRoot":"","sources":["../../../../../../src/lib/services/video/clipper/editor/textEscape.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACpG,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,IAAI;SACR,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;SACtB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;SACrB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;SACrB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC3B,CAAC"}
|
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
import type { RankedSegment } from '../../../types/segment.js';
|
|
2
2
|
import type { ClipperConfig } from '../../../types/video.js';
|
|
3
3
|
export type { ClipperConfig } from '../../../types/video.js';
|
|
4
|
+
export declare function configureFfmpeg(cfg: ClipperConfig): void;
|
|
5
|
+
/**
|
|
6
|
+
* Re-encodes a pre-downloaded segment (yt-dlp --download-sections output) to
|
|
7
|
+
* normalise A/V sync. Stream copy preserves the independent DASH cut points
|
|
8
|
+
* yt-dlp makes for video vs. audio, which leaves the two slightly offset for
|
|
9
|
+
* short segments. Re-encoding rebuilds both streams from PTS=0 and keeps them
|
|
10
|
+
* locked together.
|
|
11
|
+
*/
|
|
12
|
+
export declare function buildRemuxOutputOptions(cfg: Pick<ClipperConfig, 'ffmpegPreset'>): string[];
|
|
4
13
|
/**
|
|
5
14
|
* Generates video clips for each ranked segment using fluent-ffmpeg.
|
|
6
15
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/services/video/clipper/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/services/video/clipper/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,CAOxD;AA0CD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,GAAG,MAAM,EAAE,CAW1F;AA4BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,aAAa,EAAE,EACzB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,GAAE,MAAU,GACtB,OAAO,CAAC,MAAM,EAAE,CAAC,CAuDnB;AAED;;;;;;;;;GASG;AACH,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EAAE,EACrB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,GAAE,MAAU,GACtB,OAAO,CAAC,MAAM,EAAE,CAAC,CA0CnB;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,WAAW,EAAE,MAAM,EAAE,EACrB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,GAAE,MAAU,GACtB,OAAO,CAAC,MAAM,EAAE,CAAC,CAgDnB"}
|
|
@@ -4,7 +4,7 @@ import { join } from 'path';
|
|
|
4
4
|
import pLimit from 'p-limit';
|
|
5
5
|
import { log } from '../../../utils/logger.js';
|
|
6
6
|
import { formatSeconds } from '../../../utils/format.js';
|
|
7
|
-
function configureFfmpeg(cfg) {
|
|
7
|
+
export function configureFfmpeg(cfg) {
|
|
8
8
|
if (cfg.ffmpegPath) {
|
|
9
9
|
ffmpeg.setFfmpegPath(cfg.ffmpegPath);
|
|
10
10
|
}
|
|
@@ -41,16 +41,28 @@ function cutClip(videoPath, start, end, outputPath, cfg) {
|
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
43
|
/**
|
|
44
|
-
*
|
|
45
|
-
*
|
|
46
|
-
*
|
|
44
|
+
* Re-encodes a pre-downloaded segment (yt-dlp --download-sections output) to
|
|
45
|
+
* normalise A/V sync. Stream copy preserves the independent DASH cut points
|
|
46
|
+
* yt-dlp makes for video vs. audio, which leaves the two slightly offset for
|
|
47
|
+
* short segments. Re-encoding rebuilds both streams from PTS=0 and keeps them
|
|
48
|
+
* locked together.
|
|
47
49
|
*/
|
|
50
|
+
export function buildRemuxOutputOptions(cfg) {
|
|
51
|
+
return [
|
|
52
|
+
'-c:v',
|
|
53
|
+
'libx264',
|
|
54
|
+
'-preset',
|
|
55
|
+
cfg.ffmpegPreset,
|
|
56
|
+
'-c:a',
|
|
57
|
+
'aac',
|
|
58
|
+
'-avoid_negative_ts',
|
|
59
|
+
'make_zero',
|
|
60
|
+
];
|
|
61
|
+
}
|
|
48
62
|
function remuxSegment(sourcePath, outputPath, cfg) {
|
|
49
63
|
return new Promise((resolve, reject) => {
|
|
50
64
|
ffmpeg(sourcePath)
|
|
51
|
-
.outputOptions(
|
|
52
|
-
.outputOptions('-c:a', 'copy')
|
|
53
|
-
.outputOptions('-avoid_negative_ts', 'make_zero')
|
|
65
|
+
.outputOptions(buildRemuxOutputOptions(cfg))
|
|
54
66
|
.output(outputPath)
|
|
55
67
|
.on('end', () => resolve(outputPath))
|
|
56
68
|
.on('error', (err) => reject(err))
|
|
@@ -183,7 +195,7 @@ export async function remuxClips(sourcePaths, videoId, cfg, customPath, concurre
|
|
|
183
195
|
configureFfmpeg(cfg);
|
|
184
196
|
await fs.mkdir(outputDir, { recursive: true });
|
|
185
197
|
const limit = pLimit(concurrency);
|
|
186
|
-
log.info('remuxClips', `Remuxing ${sourcePaths.length} clip${sourcePaths.length !== 1 ? 's' : ''} (
|
|
198
|
+
log.info('remuxClips', `Remuxing ${sourcePaths.length} clip${sourcePaths.length !== 1 ? 's' : ''} (transcoded for A/V sync, max ${concurrency} parallel)...`);
|
|
187
199
|
const jobs = sourcePaths.map((sourcePath) => limit(async () => {
|
|
188
200
|
const filename = sourcePath.split('/').pop() || '';
|
|
189
201
|
const outputPath = join(outputDir, filename);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/services/video/clipper/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAMrD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/services/video/clipper/index.ts"],"names":[],"mappings":"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"}
|