Skip to content

Create polished demo videos without editing skills. Mac/Windows/Linux

Merge remote-tracking branch 'origin/main' into refactor/editor-project-dirty-state-local

wiiiii123f959548e3828
diff --cc src/components/video-editor/VideoEditor.tsx
index 72acdff0,0c12d289..86080a29
--- a/src/components/video-editor/VideoEditor.tsx
+++ b/src/components/video-editor/VideoEditor.tsx
@@@ -89,10 -87,10 +87,7 @@@ import
getAspectRatioValue,
} from "@/utils/aspectRatioUtils";
import { ExtensionIcon } from "./ExtensionIcon";
--import {
-- calculateMp4ExportDimensions,
-- calculateMp4SourceDimensions,
--} from "./exportDimensions";
++import { calculateMp4ExportDimensions, calculateMp4SourceDimensions } from "./exportDimensions";
const PhCursorFill = (props: { className?: string; weight?: "fill" | "regular" }) => (
<Cursor weight="fill" className={props.className} />
@@@ -113,11 -111,11 +108,21 @@@ const PhSettings = (props: { className?
<Gear weight={props.weight ?? "regular"} className={props.className} />
);
++import type { SourceAudioTrackSettings } from "@/components/video-editor/audio/audioTypes";
import { extensionHost } from "@/lib/extensions";
++import { useVideoEditorAudio } from "./audio/useVideoEditorAudio";
import { resolveAutoCaptionSourcePath } from "./autoCaptionSource";
import { CropControl } from "./CropControl";
import { ExportSettingsMenu } from "./ExportSettingsMenu";
import ExtensionManager from "./ExtensionManager";
++import {
++ createEditorHistoryStack,
++ type EditorHistorySnapshot,
++ recordEditorHistorySnapshot,
++ redoEditorHistoryStack,
++ resetEditorHistoryStack,
++ undoEditorHistoryStack,
++} from "./editorHistory";
import {
type EditorPreset,
type EditorPresetSnapshot,
@@@ -127,15 -125,15 +132,8 @@@
saveEditorPresets,
serializeEditorPresetSnapshot,
} from "./editorPreferences";
--import {
-- createEditorHistoryStack,
-- type EditorHistorySnapshot,
-- recordEditorHistorySnapshot,
-- redoEditorHistoryStack,
-- resetEditorHistoryStack,
-- undoEditorHistoryStack,
--} from "./editorHistory";
import ProjectBrowserDialog, { type ProjectLibraryEntry } from "./ProjectBrowserDialog";
++import { hasUnsavedProjectChanges } from "./projectDirtyState";
import {
createProjectData,
deriveNextId,
@@@ -147,9 -145,9 +145,8 @@@
toFileUrl,
validateProjectData,
} from "./projectPersistence";
- import { hasUnsavedProjectChanges } from "./projectDirtyState";
import { SettingsPanel } from "./SettingsPanel";
- import { useVideoEditorAudio } from "./audio/useVideoEditorAudio";
+ import { getDevOpenRecordingConfig, getSmokeExportConfig } from "./smokeExportConfig";
-import { useVideoEditorAudio } from "./audio/useVideoEditorAudio";
import {
APP_HEADER_ICON_BUTTON_CLASS,
DiscordLinkButton,
@@@ -159,7 -157,7 +156,6 @@@
} from "./TutorialHelp";
import TimelineEditor, { type TimelineEditorHandle } from "./timeline/TimelineEditor";
import { normalizeCursorTelemetry } from "./timeline/zoomSuggestionUtils";
--import type { SourceAudioTrackSettings } from "@/components/video-editor/audio/audioTypes";
import {
type AnnotationRegion,
type AudioRegion,
@@@ -362,108 -334,48 +332,6 @@@ function cloneStructured<T>(value: T):
return globalThis.structuredClone(value);
}
- function parseSmokeExportNumber(value: string | null): number | undefined {
- if (value === null) {
- return undefined;
- }
-
- const parsed = Number.parseInt(value, 10);
- return Number.isFinite(parsed) && parsed > 0 ? parsed : undefined;
-function isComparableObject(value: unknown): value is Record<string, unknown> {
- return typeof value === "object" && value !== null;
--}
--
- function parseSmokeExportNonNegativeNumber(value: string | null): number | undefined {
- if (value === null) {
- return undefined;
-function areDeepEqual(left: unknown, right: unknown): boolean {
- if (Object.is(left, right)) {
- return true;
-- }
--
- const parsed = Number.parseFloat(value);
- return Number.isFinite(parsed) && parsed >= 0 ? parsed : undefined;
- }
- if (Array.isArray(left) || Array.isArray(right)) {
- if (!Array.isArray(left) || !Array.isArray(right) || left.length !== right.length) {
- return false;
- }
--
- function parseSmokeExportQuality(value: string | null): ExportQuality | undefined {
- if (value === "medium" || value === "good" || value === "high" || value === "source") {
- return value;
- }
- return undefined;
- }
- for (let index = 0; index < left.length; index += 1) {
- if (!areDeepEqual(left[index], right[index])) {
- return false;
- }
- }
--
- function parseSmokeExportFps(value: string | null): ExportMp4FrameRate | undefined {
- if (value === null) return undefined;
- const parsed = Number.parseInt(value, 10);
- return isValidMp4FrameRate(parsed) ? parsed : undefined;
- }
- return true;
- }
--
- function parseSmokeRenderBackend(value: string | null): ExportRenderBackend | undefined {
- return value === "webgl" || value === "webgpu" ? value : undefined;
- }
- if (!isComparableObject(left) || !isComparableObject(right)) {
- return false;
- }
--
- function getSmokeExportConfig(search: string): SmokeExportConfig {
- const params = new URLSearchParams(search);
- const enabled = params.get("smokeExport") === "1";
- const leftKeys = Object.keys(left);
- const rightKeys = Object.keys(right);
- if (leftKeys.length !== rightKeys.length) {
- return false;
- }
--
- return {
- enabled,
- inputPath: enabled ? params.get("smokeInput") : null,
- outputPath: enabled ? params.get("smokeOutput") : null,
- useNativeExport: enabled ? params.get("smokeUseNativeExport") === "1" : false,
- encodingMode:
- enabled && params.get("smokeEncodingMode") === "fast"
- ? "fast"
- : enabled && params.get("smokeEncodingMode") === "balanced"
- ? "balanced"
- : enabled && params.get("smokeEncodingMode") === "quality"
- ? "quality"
- : undefined,
- shadowIntensity: enabled
- ? parseSmokeExportNonNegativeNumber(params.get("smokeShadowIntensity"))
- : undefined,
- webcamInputPath: enabled ? params.get("smokeWebcamInput") : null,
- webcamShadow: enabled
- ? parseSmokeExportNonNegativeNumber(params.get("smokeWebcamShadow"))
- : undefined,
- webcamSize: enabled
- ? parseSmokeExportNonNegativeNumber(params.get("smokeWebcamSize"))
- : undefined,
- pipelineModel:
- enabled && params.get("smokePipelineModel") === "modern"
- ? "modern"
- : enabled && params.get("smokePipelineModel") === "legacy"
- ? "legacy"
- : undefined,
- backendPreference:
- enabled && params.get("smokeBackendPreference") === "auto"
- ? "auto"
- : enabled && params.get("smokeBackendPreference") === "webcodecs"
- ? "webcodecs"
- : enabled && params.get("smokeBackendPreference") === "breeze"
- ? "breeze"
- : undefined,
- renderBackend: enabled
- ? parseSmokeRenderBackend(params.get("smokeRenderBackend"))
- : undefined,
- maxEncodeQueue: enabled
- ? parseSmokeExportNumber(params.get("smokeMaxEncodeQueue"))
- : undefined,
- maxDecodeQueue: enabled
- ? parseSmokeExportNumber(params.get("smokeMaxDecodeQueue"))
- : undefined,
- maxPendingFrames: enabled
- ? parseSmokeExportNumber(params.get("smokeMaxPendingFrames"))
- : undefined,
- projectPath: enabled ? params.get("smokeProject") : null,
- quality: enabled ? parseSmokeExportQuality(params.get("smokeQuality")) : undefined,
- fps: enabled ? parseSmokeExportFps(params.get("smokeFps")) : undefined,
- };
- }
- for (const key of leftKeys) {
- if (!(key in right) || !areDeepEqual(left[key], right[key])) {
- return false;
- }
- }
--
- function getDevOpenRecordingConfig(search: string): DevOpenRecordingConfig {
- const params = new URLSearchParams(search);
- return {
- inputPath: params.get("devOpenInput"),
- webcamInputPath: params.get("devOpenWebcam"),
- };
- return true;
--}
--
function getErrorMessage(error: unknown): string {
if (error instanceof Error) {
return error.message;
@@@ -623,9 -535,9 +491,8 @@@ export default function VideoEditor()
const [sourceAudioTrackSettingsByClip, setSourceAudioTrackSettingsByClip] = useState<
Record<string, SourceAudioTrackSettings>
>({});
-- const [defaultSourceAudioTrackSettings, setDefaultSourceAudioTrackSettings] = useState<
-- SourceAudioTrackSettings
-- >({});
++ const [defaultSourceAudioTrackSettings, setDefaultSourceAudioTrackSettings] =
++ useState<SourceAudioTrackSettings>({});
const [hasClipSourceAudio, setHasClipSourceAudio] = useState(false);
const [autoCaptions, setAutoCaptions] = useState<CaptionCue[]>([]);
const [autoCaptionSettings, setAutoCaptionSettings] = useState<AutoCaptionSettings>(
@@@ -1915,43 -1827,43 +1782,39 @@@
selectedAudioId,
]);
-- const applyHistorySnapshot = useCallback(
-- (snapshot: EditorHistorySnapshot) => {
-- applyingHistoryRef.current = true;
-- const cloned = cloneStructured(snapshot);
-- setZoomRegions(cloned.zoomRegions);
-- setClipRegions(cloned.clipRegions);
-- setSpeedRegions(cloned.speedRegions);
-- setAnnotationRegions(cloned.annotationRegions);
-- setAudioRegions(cloned.audioRegions);
-- setAutoCaptions(cloned.autoCaptions);
-- setSelectedZoomId(cloned.selectedZoomId);
-- setSelectedClipId(cloned.selectedClipId);
-- setSelectedAnnotationId(cloned.selectedAnnotationId);
-- setSelectedAudioId(cloned.selectedAudioId);
--
-- nextZoomIdRef.current = deriveNextId(
-- "zoom",
-- cloned.zoomRegions.map((region) => region.id),
-- );
-- nextClipIdRef.current = deriveNextId(
-- "clip",
-- cloned.clipRegions.map((region) => region.id),
-- );
-- nextAnnotationIdRef.current = deriveNextId(
-- "annotation",
-- cloned.annotationRegions.map((region) => region.id),
-- );
-- nextAudioIdRef.current = deriveNextId(
-- "audio",
-- cloned.audioRegions.map((region) => region.id),
-- );
-- nextAnnotationZIndexRef.current =
-- cloned.annotationRegions.reduce((max, region) => Math.max(max, region.zIndex), 0) +
-- 1;
-- },
-- [],
-- );
++ const applyHistorySnapshot = useCallback((snapshot: EditorHistorySnapshot) => {
++ applyingHistoryRef.current = true;
++ const cloned = cloneStructured(snapshot);
++ setZoomRegions(cloned.zoomRegions);
++ setClipRegions(cloned.clipRegions);
++ setSpeedRegions(cloned.speedRegions);
++ setAnnotationRegions(cloned.annotationRegions);
++ setAudioRegions(cloned.audioRegions);
++ setAutoCaptions(cloned.autoCaptions);
++ setSelectedZoomId(cloned.selectedZoomId);
++ setSelectedClipId(cloned.selectedClipId);
++ setSelectedAnnotationId(cloned.selectedAnnotationId);
++ setSelectedAudioId(cloned.selectedAudioId);
++
++ nextZoomIdRef.current = deriveNextId(
++ "zoom",
++ cloned.zoomRegions.map((region) => region.id),
++ );
++ nextClipIdRef.current = deriveNextId(
++ "clip",
++ cloned.clipRegions.map((region) => region.id),
++ );
++ nextAnnotationIdRef.current = deriveNextId(
++ "annotation",
++ cloned.annotationRegions.map((region) => region.id),
++ );
++ nextAudioIdRef.current = deriveNextId(
++ "audio",
++ cloned.audioRegions.map((region) => region.id),
++ );
++ nextAnnotationZIndexRef.current =
++ cloned.annotationRegions.reduce((max, region) => Math.max(max, region.zIndex), 0) + 1;
++ }, []);
const handleUndo = useCallback(() => {
const previous = undoEditorHistoryStack(editorHistoryRef.current, buildHistorySnapshot());
@@@ -2063,7 -1975,7 +1926,9 @@@
setSpeedRegions(normalizedEditor.speedRegions);
setAnnotationRegions(normalizedEditor.annotationRegions);
setAudioRegions(normalizedEditor.audioRegions);
-- setSourceAudioTrackSettingsByClip(normalizedEditor.sourceAudioTrackSettingsByClip ?? {});
++ setSourceAudioTrackSettingsByClip(
++ normalizedEditor.sourceAudioTrackSettingsByClip ?? {},
++ );
setDefaultSourceAudioTrackSettings(
normalizedEditor.defaultSourceAudioTrackSettings ?? {},
);
@@@ -2429,7 -2346,7 +2294,7 @@@
sessionVideoPath: session?.videoPath,
videoSourcePath: videoSourcePath,
match: session?.videoPath === videoSourcePath,
-- webcamPath: session?.webcamPath
++ webcamPath: session?.webcamPath,
});
if (!session || session.videoPath !== videoSourcePath) {
@@@ -3324,21 -3241,21 +3189,27 @@@
setAutoSuggestZoomsTrigger(0);
}, []);
-- const handleSeek = useCallback((time: number, options: { pause?: boolean } = {}) => {
-- const playback = videoPlaybackRef.current;
-- const video = playback?.video;
-- if (!video) return;
++ const handleSeek = useCallback(
++ (time: number, options: { pause?: boolean } = {}) => {
++ const playback = videoPlaybackRef.current;
++ const video = playback?.video;
++ if (!video) return;
-- if (options.pause && !video.paused) {
-- playback?.pause();
-- }
++ if (options.pause && !video.paused) {
++ playback?.pause();
++ }
-- video.currentTime = mapTimelineTimeToSourceTime(time * 1000) / 1000;
-- }, [mapTimelineTimeToSourceTime]);
++ video.currentTime = mapTimelineTimeToSourceTime(time * 1000) / 1000;
++ },
++ [mapTimelineTimeToSourceTime],
++ );
-- const handleTimelineSeek = useCallback((time: number) => {
-- handleSeek(time, { pause: true });
-- }, [handleSeek]);
++ const handleTimelineSeek = useCallback(
++ (time: number) => {
++ handleSeek(time, { pause: true });
++ },
++ [handleSeek],
++ );
const handleSelectZoom = useCallback((id: string | null) => {
setSelectedZoomId(id);
@@@ -3735,17 -3652,17 +3606,17 @@@
}
}, []);
-- const handleAudioAdded = useCallback((span: Span, audioPath: string, trackIndex?: number) => {
-- const id = `audio-${nextAudioIdRef.current++}`;
-- const newRegion: AudioRegion = {
-- id,
-- startMs: Math.round(span.start),
-- endMs: Math.round(span.end),
-- audioPath,
-- volume: 1,
-- normalize: false,
-- trackIndex,
-- };
++ const handleAudioAdded = useCallback((span: Span, audioPath: string, trackIndex?: number) => {
++ const id = `audio-${nextAudioIdRef.current++}`;
++ const newRegion: AudioRegion = {
++ id,
++ startMs: Math.round(span.start),
++ endMs: Math.round(span.end),
++ audioPath,
++ volume: 1,
++ normalize: false,
++ trackIndex,
++ };
setAudioRegions((prev) => [...prev, newRegion]);
setSelectedAudioId(id);
setSelectedZoomId(null);
@@@ -3795,29 -3712,29 +3666,29 @@@
[selectedAudioId],
);
-- const handleAudioDelete = useCallback(
-- (id: string) => {
++ const handleAudioDelete = useCallback(
++ (id: string) => {
setAudioRegions((prev) => prev.filter((region) => region.id !== id));
if (selectedAudioId === id) {
setSelectedAudioId(null);
}
},
-- [selectedAudioId],
-- );
++ [selectedAudioId],
++ );
-- const handleAudioNormalizeChange = useCallback(
-- (normalize: boolean) => {
-- if (!selectedAudioId) {
-- return;
-- }
-- setAudioRegions((prev) =>
-- prev.map((region) =>
-- region.id === selectedAudioId ? { ...region, normalize } : region,
-- ),
-- );
-- },
-- [selectedAudioId],
-- );
++ const handleAudioNormalizeChange = useCallback(
++ (normalize: boolean) => {
++ if (!selectedAudioId) {
++ return;
++ }
++ setAudioRegions((prev) =>
++ prev.map((region) =>
++ region.id === selectedAudioId ? { ...region, normalize } : region,
++ ),
++ );
++ },
++ [selectedAudioId],
++ );
const handleAnnotationAdded = useCallback((span: Span, trackIndex = 0) => {
const id = `annotation-${nextAnnotationIdRef.current++}`;
@@@ -5715,19 -5632,19 +5586,20 @@@
selectedClipId={selectedClipId}
selectedClipSpeed={
selectedClipId
-- ? clipRegions.find((c) => c.id === selectedClipId)?.speed ?? 1
++ ? (clipRegions.find((c) => c.id === selectedClipId)
++ ?.speed ?? 1)
: null
}
selectedClipMuted={
selectedClipId
-- ? clipRegions.find((c) => c.id === selectedClipId)?.muted ??
-- false
++ ? (clipRegions.find((c) => c.id === selectedClipId)
++ ?.muted ?? false)
: null
}
selectedClipShowSourceAudio={
selectedClipId
-- ? clipRegions.find((c) => c.id === selectedClipId)
-- ?.showSourceAudio ?? false
++ ? (clipRegions.find((c) => c.id === selectedClipId)
++ ?.showSourceAudio ?? false)
: null
}
onClipSpeedChange={handleClipSpeedChange}
@@@ -5736,7 -5653,7 +5608,9 @@@
onClipDelete={handleClipDelete}
hasClipSourceAudio={hasClipSourceAudio}
sourceAudioTrackMeta={audio.sourceAudioTrackMeta}
-- sourceAudioTrackSettings={audio.selectedClipSourceAudioTrackSettings}
++ sourceAudioTrackSettings={
++ audio.selectedClipSourceAudioTrackSettings
++ }
onSourceAudioTrackVolumeChange={
audio.onSelectedClipSourceAudioTrackVolumeChange
}
@@@ -5744,21 -5661,21 +5618,21 @@@
audio.onSelectedClipSourceAudioTrackNormalizeChange
}
selectedAudioId={selectedAudioId}
-- selectedAudioVolume={
-- selectedAudioId
-- ? (audioRegions.find((r) => r.id === selectedAudioId)
-- ?.volume ?? null)
-- : null
-- }
-- selectedAudioNormalize={
-- selectedAudioId
-- ? (audioRegions.find((r) => r.id === selectedAudioId)
-- ?.normalize ?? false)
-- : null
-- }
-- onAudioVolumeChange={handleAudioVolumeChange}
-- onAudioNormalizeChange={handleAudioNormalizeChange}
-- onAudioDelete={handleAudioDelete}
++ selectedAudioVolume={
++ selectedAudioId
++ ? (audioRegions.find((r) => r.id === selectedAudioId)
++ ?.volume ?? null)
++ : null
++ }
++ selectedAudioNormalize={
++ selectedAudioId
++ ? (audioRegions.find((r) => r.id === selectedAudioId)
++ ?.normalize ?? false)
++ : null
++ }
++ onAudioVolumeChange={handleAudioVolumeChange}
++ onAudioNormalizeChange={handleAudioNormalizeChange}
++ onAudioDelete={handleAudioDelete}
shadowIntensity={shadowIntensity}
onShadowChange={setShadowIntensity}
backgroundBlur={backgroundBlur}
@@@ -6055,13 -5972,13 +5929,15 @@@
}
cursorSway={cursorSway}
volume={
-- audio.shouldMutePreviewVideo || audio.isCurrentClipMuted
++ audio.shouldMutePreviewVideo ||
++ audio.isCurrentClipMuted
? 0
: Math.max(
0,
Math.min(
1,
-- previewVolume * audio.embeddedSourcePreviewGain,
++ previewVolume *
++ audio.embeddedSourcePreviewGain,
),
)
}