lee/Recordly
1
0
Fork 0
mirror of https://github.com/webadderallorg/Recordly.git synced 2026-09-25 15:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(export): preserve pitch for fallback speed audio

Browse Source
This commit is contained in:
wiiiii123
2026-05-06 06:43:40 +07:00
parent 9ac4c55ccf
commit 1168e0edcc
10 changed files with 143 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
electron/electron-env.d.ts
Vendored
+2
View File
@@ -427,6 +427,7 @@ interface Window {
audioMode?: "none" | "copy-source" | "trim-source" | "edited-track";
audioSourcePath?: string | null;
audioSourceSampleRate?: number;
outputDurationSec?: number;
trimSegments?: Array<{ startMs: number; endMs: number }>;
editedTrackStrategy?: "filtergraph-fast-path" | "offline-render-fallback";
editedTrackSegments?: Array<{ startMs: number; endMs: number; speed: number }>;
@@ -445,6 +446,7 @@ interface Window {
audioMode?: "none" | "copy-source" | "trim-source" | "edited-track";
audioSourcePath?: string | null;
audioSourceSampleRate?: number;
outputDurationSec?: number;
trimSegments?: Array<{ startMs: number; endMs: number }>;
editedTrackStrategy?: "filtergraph-fast-path" | "offline-render-fallback";
editedTrackSegments?: Array<{ startMs: number; endMs: number; speed: number }>;
electron/ipc/recording/ffmpeg.ts
+4 -4
View File
@@ -1,12 +1,12 @@
import type { ChildProcessWithoutNullStreams } from "node:child_process";
import { access } from "node:fs/promises";
import type { SelectedSource } from "../types";
import fs from "node:fs/promises";
import { resolveLinuxWindowBounds } from "../cursor/bounds";
import {
ffmpegCaptureOutputBuffer,
} from "../state";
import type { SelectedSource } from "../types";
import { getScreen, parseWindowId } from "../utils";
import { resolveWindowsCaptureDisplay } from "../windowsCaptureSelection";
import { resolveLinuxWindowBounds } from "../cursor/bounds";
export function getDisplayBoundsForSource(source: SelectedSource) {
return resolveWindowsCaptureDisplay(
@@ -175,7 +175,7 @@ export function waitForFfmpegCaptureStop(process: ChildProcessWithoutNullStreams
cleanup();
try {
await access(outputPath);
await fs.access(outputPath);
if (code === 0 || code === null) {
resolve(outputPath);
return;
electron/preload.ts
+5
View File
@@ -367,6 +367,7 @@ contextBridge.exposeInMainWorld("electronAPI", {
audioMode?: "none" | "copy-source" | "trim-source" | "edited-track";
audioSourcePath?: string | null;
audioSourceSampleRate?: number;
outputDurationSec?: number;
trimSegments?: Array<{ startMs: number; endMs: number }>;
editedTrackStrategy?: "filtergraph-fast-path" | "offline-render-fallback";
editedTrackSegments?: Array<{ startMs: number; endMs: number; speed: number }>;
@@ -386,7 +387,11 @@ contextBridge.exposeInMainWorld("electronAPI", {
options?: {
audioMode?: "none" | "copy-source" | "trim-source" | "edited-track";
audioSourcePath?: string | null;
audioSourceSampleRate?: number;
outputDurationSec?: number;
trimSegments?: Array<{ startMs: number; endMs: number }>;
editedTrackStrategy?: "filtergraph-fast-path" | "offline-render-fallback";
editedTrackSegments?: Array<{ startMs: number; endMs: number; speed: number }>;
editedAudioData?: ArrayBuffer;
editedAudioMimeType?: string | null;
},
package.json
+5 -4
View File
@@ -17,7 +17,7 @@
"scripts": {
"dev": "vite --config vite.config.ts",
"postinstall": "node scripts/postinstall.mjs",
"build": "npm run build:platform-native-helpers && tsc && vite build --config vite.config.ts && electron-builder",
"build": "npm run build:platform-native-helpers && tsc && vite build --config vite.config.ts && npm run smoke:electron-main-cjs && electron-builder",
"lint": "biome check .",
"lint:fix": "biome check --write .",
"format": "biome format --write .",
@@ -30,11 +30,12 @@
"build:nvidia-cuda-compositor": "node scripts/build-nvidia-cuda-compositor.mjs",
"build:windows-capture": "node scripts/build-windows-capture.mjs",
"build:cursor-monitor": "node scripts/build-cursor-monitor.mjs",
"build:mac": "npm run build:platform-native-helpers && tsc && vite build --config vite.config.ts && electron-builder --mac",
"build:win": "npm run build:platform-native-helpers && tsc && vite build --config vite.config.ts && electron-builder --win",
"build:linux": "npm run build:platform-native-helpers && tsc && vite build --config vite.config.ts && electron-builder --linux",
"build:mac": "npm run build:platform-native-helpers && tsc && vite build --config vite.config.ts && npm run smoke:electron-main-cjs && electron-builder --mac",
"build:win": "npm run build:platform-native-helpers && tsc && vite build --config vite.config.ts && npm run smoke:electron-main-cjs && electron-builder --win",
"build:linux": "npm run build:platform-native-helpers && tsc && vite build --config vite.config.ts && npm run smoke:electron-main-cjs && electron-builder --linux",
"i18n:check": "node scripts/i18n-check.mjs",
"benchmark:export-queues": "node scripts/benchmark-export-queues.mjs",
"smoke:electron-main-cjs": "node scripts/smoke-electron-main-cjs.mjs",
"smoke:packaged-binaries": "node scripts/smoke-packaged-binaries.mjs",
"checksums:release": "node scripts/write-release-checksums.mjs",
"release:create": "node scripts/create-release.mjs",
scripts/smoke-electron-main-cjs.mjs
+28
View File
@@ -0,0 +1,28 @@
import fs from "node:fs/promises";
const mainBundleUrl = new URL("../dist-electron/main.cjs", import.meta.url);
const mainBundlePath = mainBundleUrl.pathname;
let source;
try {
source = await fs.readFile(mainBundleUrl, "utf8");
} catch (error) {
throw new Error(`Unable to read dist-electron/main.cjs: ${error}`);
}
const esmImportPattern = /^[ \t]*import\s+(?:(?:[\w*{][^\n;]*?)\s+from\s+)?["'][^"']+["'];?/gm;
const matches = [...source.matchAll(esmImportPattern)].map((match) => ({
line: source.slice(0, match.index).split(/\r?\n/).length,
text: match[0].trim(),
}));
if (matches.length > 0) {
const details = matches.map((match) => `line ${match.line}: ${match.text}`).join("\n");
throw new Error(`dist-electron/main.cjs contains ESM import syntax:\n${details}`);
}
if (/\bimport\.meta\b/.test(source)) {
throw new Error("dist-electron/main.cjs contains import.meta syntax");
}
console.log(`Electron main CJS smoke passed: ${mainBundlePath}`);
src/lib/exporter/editedTrackStrategy.test.ts
+2 -2
View File
@@ -23,7 +23,7 @@ describe("editedTrackStrategy", () => {
).toBe("filtergraph-fast-path");
});
it("falls back when the edited track depends on sidecar sources", () => {
it("marks a single external source audio track as a filtergraph candidate", () => {
const speedRegions: SpeedRegion[] = [
{ id: "speed-1", startMs: 2_000, endMs: 10_000, speed: 1.25 },
];
@@ -37,7 +37,7 @@ describe("editedTrackStrategy", () => {
audioRegions: [],
sourceAudioFallbackPaths: ["mic.m4a"],
}),
).toBe("offline-render-fallback");
).toBe("filtergraph-fast-path");
});
it("falls back for multi-source mixes", () => {
src/lib/exporter/editedTrackStrategy.ts
+5 -1
View File
@@ -158,7 +158,11 @@ export function classifyEditedTrackStrategy(input: EditedTrackStrategyInput): Ed
return "offline-render-fallback";
}
if (input.sourceAudioFallbackPaths.length > 0) {
if (
input.sourceAudioFallbackPaths.some(
(audioPath) => audioPath !== input.primaryAudioSourcePath,
)
) {
return "offline-render-fallback";
}
src/lib/exporter/modernVideoExporter.nativeStaticLayout.test.ts
+54
View File
@@ -39,6 +39,7 @@ function createExporter(overrides: Record<string, unknown> = {}) {
experimentalNativeExport: true,
...overrides,
} as never) as unknown as {
buildNativeAudioPlan: (videoInfo: DecodedVideoInfo) => unknown;
getNativeStaticLayoutSkipReason: (
audioPlan: unknown,
videoInfo: DecodedVideoInfo,
@@ -52,6 +53,59 @@ afterEach(() => {
});
describe("ModernVideoExporter native static-layout eligibility", () => {
it("uses FFmpeg filtergraph audio for speed edits with a single external source track", () => {
const speedRegions: SpeedRegion[] = [
{ id: "speed-1", startMs: 1_000, endMs: 4_000, speed: 1.5 },
];
const exporter = createExporter({
speedRegions,
sourceAudioFallbackPaths: ["C:\\recordly\\recording.system.wav"],
});
expect(
exporter.buildNativeAudioPlan({
...videoInfo,
hasAudio: false,
audioCodec: undefined,
audioSampleRate: undefined,
}),
).toMatchObject({
audioMode: "edited-track",
strategy: "filtergraph-fast-path",
audioSourcePath: "C:\\recordly\\recording.system.wav",
audioSourceSampleRate: 48_000,
editedTrackSegments: [
{ startMs: 0, endMs: 1_000, speed: 1 },
{ startMs: 1_000, endMs: 4_000, speed: 1.5 },
{ startMs: 4_000, endMs: 60_000, speed: 1 },
],
});
});
it("keeps timed companion audio on the offline render path", () => {
const audioPath = "C:\\recordly\\recording.system.wav";
const speedRegions: SpeedRegion[] = [
{ id: "speed-1", startMs: 1_000, endMs: 4_000, speed: 1.5 },
];
const exporter = createExporter({
speedRegions,
sourceAudioFallbackPaths: [audioPath],
sourceAudioFallbackStartDelayMsByPath: { [audioPath]: 250 },
});
expect(
exporter.buildNativeAudioPlan({
...videoInfo,
hasAudio: false,
audioCodec: undefined,
audioSampleRate: undefined,
}),
).toEqual({
audioMode: "edited-track",
strategy: "offline-render-fallback",
});
});
it("allows native video when only the audio track needs offline editing", () => {
const audioRegions: AudioRegion[] = [
{
src/lib/exporter/modernVideoExporter.ts
+19 -8
View File
@@ -158,6 +158,8 @@ type NativeAudioPlan =
editedTrackSegments: Array<{ startMs: number; endMs: number; speed: number }>;
};
const FILTERGRAPH_FALLBACK_AUDIO_SAMPLE_RATE = 48_000;
type NativeStaticLayoutTimelineSegment = {
sourceStartMs: number;
sourceEndMs: number;
@@ -996,6 +998,11 @@ export class ModernVideoExporter {
(videoInfo.hasAudio ? localVideoSourcePath : null) ??
sourceAudioFallbackPaths[0] ??
null;
const usesEmbeddedPrimaryAudio =
Boolean(videoInfo.hasAudio) && primaryAudioSourcePath === localVideoSourcePath;
const primaryAudioSourceSampleRate = usesEmbeddedPrimaryAudio
? videoInfo.audioSampleRate
: FILTERGRAPH_FALLBACK_AUDIO_SAMPLE_RATE;
if (
!videoInfo.hasAudio &&
@@ -1016,13 +1023,16 @@ export class ModernVideoExporter {
Math.round((videoInfo.streamDuration ?? videoInfo.duration) * 1000),
);
const trimRegions = this.config.trimRegions ?? [];
const canUsePrimaryAudioFiltergraph =
Boolean(primaryAudioSourcePath) &&
!hasTimedSourceAudioFallback &&
(usesEmbeddedPrimaryAudio ||
sourceAudioFallbackPaths.includes(primaryAudioSourcePath ?? "")) &&
typeof primaryAudioSourceSampleRate === "number" &&
Number.isFinite(primaryAudioSourceSampleRate) &&
primaryAudioSourceSampleRate > 0;
const strategy =
videoInfo.hasAudio &&
localVideoSourcePath &&
sourceAudioFallbackPaths.length === 0 &&
typeof videoInfo.audioSampleRate === "number" &&
Number.isFinite(videoInfo.audioSampleRate) &&
videoInfo.audioSampleRate > 0
canUsePrimaryAudioFiltergraph
? classifyEditedTrackStrategy({
primaryAudioSourcePath,
sourceDurationMs,
@@ -1034,8 +1044,8 @@ export class ModernVideoExporter {
: "offline-render-fallback";
if (strategy === "filtergraph-fast-path") {
const audioSourcePath = localVideoSourcePath;
const audioSourceSampleRate = videoInfo.audioSampleRate;
const audioSourcePath = primaryAudioSourcePath;
const audioSourceSampleRate = primaryAudioSourceSampleRate;
const editedTrackSegments = buildEditedTrackSourceSegments(
sourceDurationMs,
trimRegions,
@@ -2260,6 +2270,7 @@ export class ModernVideoExporter {
audioPlan.strategy === "filtergraph-fast-path"
? audioPlan.audioSourceSampleRate
: undefined,
outputDurationSec: this.effectiveDurationSec,
editedAudioData: editedAudioBuffer,
editedAudioMimeType,
};
src/lib/exporter/videoExporter.ts
+19 -8
View File
@@ -113,6 +113,8 @@ type NativeAudioPlan =
editedTrackSegments: Array<{ startMs: number; endMs: number; speed: number }>;
};
const FILTERGRAPH_FALLBACK_AUDIO_SAMPLE_RATE = 48_000;
export class VideoExporter {
private config: VideoExporterConfig;
private streamingDecoder: StreamingVideoDecoder | null = null;
@@ -533,6 +535,11 @@ export class VideoExporter {
(videoInfo.hasAudio ? localVideoSourcePath : null) ??
sourceAudioFallbackPaths[0] ??
null;
const usesEmbeddedPrimaryAudio =
Boolean(videoInfo.hasAudio) && primaryAudioSourcePath === localVideoSourcePath;
const primaryAudioSourceSampleRate = usesEmbeddedPrimaryAudio
? videoInfo.audioSampleRate
: FILTERGRAPH_FALLBACK_AUDIO_SAMPLE_RATE;
if (
!videoInfo.hasAudio &&
@@ -553,13 +560,16 @@ export class VideoExporter {
Math.round((videoInfo.streamDuration ?? videoInfo.duration) * 1000),
);
const trimRegions = this.config.trimRegions ?? [];
const canUsePrimaryAudioFiltergraph =
Boolean(primaryAudioSourcePath) &&
!hasTimedSourceAudioFallback &&
(usesEmbeddedPrimaryAudio ||
sourceAudioFallbackPaths.includes(primaryAudioSourcePath ?? "")) &&
typeof primaryAudioSourceSampleRate === "number" &&
Number.isFinite(primaryAudioSourceSampleRate) &&
primaryAudioSourceSampleRate > 0;
const strategy =
videoInfo.hasAudio &&
localVideoSourcePath &&
sourceAudioFallbackPaths.length === 0 &&
typeof videoInfo.audioSampleRate === "number" &&
Number.isFinite(videoInfo.audioSampleRate) &&
videoInfo.audioSampleRate > 0
canUsePrimaryAudioFiltergraph
? classifyEditedTrackStrategy({
primaryAudioSourcePath,
sourceDurationMs,
@@ -571,8 +581,8 @@ export class VideoExporter {
: "offline-render-fallback";
if (strategy === "filtergraph-fast-path") {
const audioSourcePath = localVideoSourcePath;
const audioSourceSampleRate = videoInfo.audioSampleRate;
const audioSourcePath = primaryAudioSourcePath;
const audioSourceSampleRate = primaryAudioSourceSampleRate;
const editedTrackSegments = buildEditedTrackSourceSegments(
sourceDurationMs,
trimRegions,
@@ -950,6 +960,7 @@ export class VideoExporter {
audioPlan.strategy === "filtergraph-fast-path"
? audioPlan.audioSourceSampleRate
: undefined,
outputDurationSec: this.effectiveDurationSec,
editedAudioData: editedAudioBuffer,
editedAudioMimeType,
};