Create polished demo videos without editing skills. Mac/Windows/Linux
Revert "feat: bundle cursor motion and temporal blur updates"
webadderall132c77a5ccf2
diff --git a/electron/electron-env.d.ts b/electron/electron-env.d.tsindex 773784ae..170641ae 100644--- a/electron/electron-env.d.ts+++ b/electron/electron-env.d.ts@@ -151,12 +151,12 @@ interface Window {message?: string;error?: string;}>;- pauseCursorCapture: () => Promise<{+ pauseCursorCapture: (boundaryMs?: number) => Promise<{success: boolean;message?: string;error?: string;}>;- resumeCursorCapture: () => Promise<{+ resumeCursorCapture: (boundaryMs?: number) => Promise<{success: boolean;message?: string;error?: string;@@ -313,15 +313,6 @@ interface Window {message?: string;error?: string;}>;- setCursorTelemetry: (- videoPath: string | undefined,- samples: CursorTelemetryPoint[],- ) => Promise<{- success: boolean;- samples: CursorTelemetryPoint[];- message?: string;- error?: string;- }>;getSystemCursorAssets: () => Promise<{success: boolean;cursors: Record<string, SystemCursorAsset>;@@ -419,28 +410,16 @@ interface Window {}>;setCurrentVideoPath: (path: string,- options?: {- preserveProjectPath?: boolean;- hideOverlayCursorByDefault?: boolean;- },- ) => Promise<{ success: boolean; webcamPath: string | null }>;- setCurrentRecordingSession: (- session: {- videoPath: string;- webcamPath?: string | null;- timeOffsetMs?: number;- hideOverlayCursorByDefault?: boolean;- },options?: { preserveProjectPath?: boolean },- ) => Promise<{ success: boolean }>;+ ) => Promise<{ success: boolean; webcamPath: string | null }>;+ setCurrentRecordingSession: (session: {+ videoPath: string;+ webcamPath?: string | null;+ timeOffsetMs?: number;+ }, options?: { preserveProjectPath?: boolean }) => Promise<{ success: boolean }>;getCurrentRecordingSession: () => Promise<{success: boolean;- session?: {- videoPath: string;- webcamPath?: string | null;- timeOffsetMs?: number;- hideOverlayCursorByDefault?: boolean;- };+ session?: { videoPath: string; webcamPath?: string | null; timeOffsetMs?: number };}>;getCurrentVideoPath: () => Promise<{ success: boolean; path?: string }>;clearCurrentVideoPath: () => Promise<{ success: boolean }>;@@ -550,7 +529,6 @@ interface Window {onMenuSaveProject: (callback: () => void) => () => void;onMenuSaveProjectAs: (callback: () => void) => () => void;getPlatform: () => Promise<string>;- getLinuxWindowSystem: () => Promise<"wayland" | "x11" | null>;revealInFolder: (filePath: string,) => Promise<{ success: boolean; error?: string; message?: string }>;diff --git a/electron/ipc/cursor/telemetry.test.ts b/electron/ipc/cursor/telemetry.test.tsindex 8c9b06b8..de9b65e7 100644--- a/electron/ipc/cursor/telemetry.test.ts+++ b/electron/ipc/cursor/telemetry.test.ts@@ -1,17 +1,4 @@import { beforeEach, describe, expect, it, vi } from "vitest";-import { CURSOR_TELEMETRY_VERSION } from "../constants";--const { writeFile, rm } = vi.hoisted(() => ({- writeFile: vi.fn(),- rm: vi.fn(),-}));--vi.mock("node:fs/promises", () => ({- default: {- writeFile,- rm,- },-}));vi.mock("electron", () => ({app: {@@ -31,18 +18,14 @@ vi.mock("../utils", () => ({import {getCursorCaptureElapsedMs,- normalizeCursorTelemetrySamples,pauseCursorCapture,resetCursorCaptureClock,resumeCursorCapture,- writeCursorTelemetry,} from "./telemetry";import { setCursorCaptureStartTimeMs } from "../state";describe("cursor telemetry pause clock", () => {beforeEach(() => {- writeFile.mockReset();- rm.mockReset();setCursorCaptureStartTimeMs(1_000);resetCursorCaptureClock();});@@ -65,41 +48,4 @@ describe("cursor telemetry pause clock", () => {expect(getCursorCaptureElapsedMs(1_900)).toBe(550);});-- it("normalizes cursor telemetry samples before persisting them", async () => {- const samples = normalizeCursorTelemetrySamples([- { timeMs: 30, cx: 2, cy: -1, interactionType: "click", cursorType: "pointer" },- { timeMs: -10, cx: Number.NaN, cy: 0.2, interactionType: "drag", cursorType: "ibeam" },- { timeMs: 10, cx: 0.25, cy: 0.75, interactionType: "move", cursorType: "text" },- ]);-- expect(samples).toEqual([- { timeMs: 0, cx: 0.5, cy: 0.2, interactionType: undefined, cursorType: undefined },- { timeMs: 10, cx: 0.25, cy: 0.75, interactionType: "move", cursorType: "text" },- { timeMs: 30, cx: 1, cy: 0, interactionType: "click", cursorType: "pointer" },- ]);-- await writeCursorTelemetry("/tmp/recording.mp4", samples);-- expect(writeFile).toHaveBeenCalledWith(- "/tmp/recording.cursor.json",- JSON.stringify(- {- version: CURSOR_TELEMETRY_VERSION,- samples,- },- null,- 2,- ),- "utf-8",- );- expect(rm).not.toHaveBeenCalled();- });-- it("removes the sidecar when saving an empty cursor telemetry payload", async () => {- await writeCursorTelemetry("/tmp/recording.mp4", []);-- expect(rm).toHaveBeenCalledWith("/tmp/recording.cursor.json", { force: true });- expect(writeFile).not.toHaveBeenCalled();- });});diff --git a/electron/ipc/cursor/telemetry.ts b/electron/ipc/cursor/telemetry.tsindex 9191542a..18b8a174 100644--- a/electron/ipc/cursor/telemetry.ts+++ b/electron/ipc/cursor/telemetry.ts@@ -28,78 +28,6 @@ export function clamp(value: number, min: number, max: number) {return Math.min(max, Math.max(min, value));}-export function normalizeCursorTelemetrySamples(rawSamples: unknown): CursorTelemetryPoint[] {- const samples = Array.isArray(rawSamples)- ? rawSamples- : Array.isArray((rawSamples as { samples?: unknown[] } | null | undefined)?.samples)- ? ((rawSamples as { samples: unknown[] }).samples ?? [])- : [];-- return samples- .filter((sample: unknown) => Boolean(sample && typeof sample === "object"))- .map((sample: unknown) => {- const point = sample as Partial<CursorTelemetryPoint>;- return {- timeMs:- typeof point.timeMs === "number" && Number.isFinite(point.timeMs)- ? Math.max(0, point.timeMs)- : 0,- cx:- typeof point.cx === "number" && Number.isFinite(point.cx)- ? clamp(point.cx, 0, 1)- : 0.5,- cy:- typeof point.cy === "number" && Number.isFinite(point.cy)- ? clamp(point.cy, 0, 1)- : 0.5,- interactionType:- point.interactionType === "click" ||- point.interactionType === "double-click" ||- point.interactionType === "right-click" ||- point.interactionType === "middle-click" ||- point.interactionType === "move" ||- point.interactionType === "mouseup"- ? point.interactionType- : undefined,- cursorType:- point.cursorType === "arrow" ||- point.cursorType === "text" ||- point.cursorType === "pointer" ||- point.cursorType === "crosshair" ||- point.cursorType === "open-hand" ||- point.cursorType === "closed-hand" ||- point.cursorType === "resize-ew" ||- point.cursorType === "resize-ns" ||- point.cursorType === "not-allowed"- ? point.cursorType- : undefined,- };- })- .sort((a, b) => a.timeMs - b.timeMs);-}--export async function writeCursorTelemetry(videoPath: string, samples: unknown) {- const telemetryPath = getTelemetryPathForVideo(videoPath);- const normalizedSamples = normalizeCursorTelemetrySamples(samples);-- if (normalizedSamples.length === 0) {- await fs.rm(telemetryPath, { force: true });- return normalizedSamples;- }-- await fs.writeFile(- telemetryPath,- JSON.stringify(- { version: CURSOR_TELEMETRY_VERSION, samples: normalizedSamples },- null,- 2,- ),- "utf-8",- );-- return normalizedSamples;-}-export function stopCursorCapture() {if (cursorCaptureInterval) {clearTimeout(cursorCaptureInterval);@@ -240,9 +168,9 @@ export function pushCursorSample(}}-export function sampleCursorPoint() {+export function sampleCursorPoint(sampledAtMs = Date.now()) {const point = getNormalizedCursorPoint();- pushCursorSample(point.cx, point.cy, getCursorCaptureElapsedMs(), "move");+ pushCursorSample(point.cx, point.cy, getCursorCaptureElapsedMs(sampledAtMs), "move");}export async function persistPendingCursorTelemetry(videoPath: string) {diff --git a/electron/ipc/register/project.ts b/electron/ipc/register/project.tsindex a18d263d..570d7b58 100644--- a/electron/ipc/register/project.ts+++ b/electron/ipc/register/project.ts@@ -45,10 +45,6 @@ function normalizeRecordingTimeOffsetMs(value: unknown): number {return typeof value === "number" && Number.isFinite(value) ? Math.round(value) : 0;}-function normalizeBoolean(value: unknown, fallback = false): boolean {- return typeof value === "boolean" ? value : fallback;-}-/*** Produces a filesystem-safe project base name without the project extension.*/@@ -531,7 +527,7 @@ export function registerProjectHandlers() {return { success: false, error: String(error), message: 'Failed to open projects folder.' }}})- ipcMain.handle('set-current-video-path', async (_, path: string, options?: { preserveProjectPath?: boolean; hideOverlayCursorByDefault?: boolean }) => {+ ipcMain.handle('set-current-video-path', async (_, path: string, options?: { preserveProjectPath?: boolean }) => {setCurrentVideoPath(normalizeVideoSourcePath(path) ?? path)approveUserPath(currentVideoPath)const resolvedSession = await resolveRecordingSession(currentVideoPath)@@ -541,12 +537,7 @@ export function registerProjectHandlers() {timeOffsetMs: 0,}- setCurrentRecordingSession({- ...resolvedSession,- hideOverlayCursorByDefault:- normalizeBoolean(options?.hideOverlayCursorByDefault) ||- normalizeBoolean(resolvedSession.hideOverlayCursorByDefault),- })+ setCurrentRecordingSession(resolvedSession)await replaceApprovedSessionLocalReadPaths([resolvedSession.videoPath,resolvedSession.webcamPath,@@ -562,14 +553,13 @@ export function registerProjectHandlers() {return { success: true, webcamPath: resolvedSession.webcamPath ?? null }})- ipcMain.handle('set-current-recording-session', async (_, session: { videoPath: string; webcamPath?: string | null; timeOffsetMs?: number; hideOverlayCursorByDefault?: boolean }, options?: { preserveProjectPath?: boolean }) => {+ ipcMain.handle('set-current-recording-session', async (_, session: { videoPath: string; webcamPath?: string | null; timeOffsetMs?: number }, options?: { preserveProjectPath?: boolean }) => {const normalizedVideoPath = normalizeVideoSourcePath(session.videoPath) ?? session.videoPathsetCurrentVideoPath(normalizedVideoPath)setCurrentRecordingSession({videoPath: normalizedVideoPath,webcamPath: normalizeVideoSourcePath(session.webcamPath ?? null),timeOffsetMs: normalizeRecordingTimeOffsetMs(session.timeOffsetMs),- hideOverlayCursorByDefault: normalizeBoolean(session.hideOverlayCursorByDefault),});await replaceApprovedSessionLocalReadPaths([currentRecordingSession!.videoPath,diff --git a/electron/ipc/register/recording.ts b/electron/ipc/register/recording.tsindex 40a8d2f6..0e491b80 100644--- a/electron/ipc/register/recording.ts+++ b/electron/ipc/register/recording.ts@@ -18,7 +18,7 @@ import { startWindowBoundsCapture, stopWindowBoundsCapture } from "../cursor/bouimport { startInteractionCapture, stopInteractionCapture } from "../cursor/interaction";import { startNativeCursorMonitor, stopNativeCursorMonitor } from "../cursor/monitor";import {- normalizeCursorTelemetrySamples,+ clamp,pauseCursorCapture,resumeCursorCapture,resetCursorCaptureClock,@@ -26,7 +26,6 @@ import {snapshotCursorTelemetryForPersistence,startCursorSampling,stopCursorCapture,- writeCursorTelemetry,} from "../cursor/telemetry";import { getFfmpegBinaryPath } from "../ffmpeg/binary";import {@@ -1313,15 +1312,23 @@ export function registerRecordingHandlers(}});- ipcMain.handle("pause-cursor-capture", () => {- sampleCursorPoint();- pauseCursorCapture(Date.now());+ ipcMain.handle("pause-cursor-capture", (_event, boundaryMs?: number) => {+ const timestamp =+ typeof boundaryMs === "number" && Number.isFinite(boundaryMs)+ ? boundaryMs+ : Date.now();+ sampleCursorPoint(timestamp);+ pauseCursorCapture(timestamp);return { success: true };});- ipcMain.handle("resume-cursor-capture", () => {- resumeCursorCapture(Date.now());- sampleCursorPoint();+ ipcMain.handle("resume-cursor-capture", (_event, boundaryMs?: number) => {+ const timestamp =+ typeof boundaryMs === "number" && Number.isFinite(boundaryMs)+ ? boundaryMs+ : Date.now();+ resumeCursorCapture(timestamp);+ sampleCursorPoint(timestamp);return { success: true };});@@ -1335,7 +1342,53 @@ export function registerRecordingHandlers(try {const content = await fs.readFile(telemetryPath, "utf-8");const parsed = JSON.parse(content);- const samples = normalizeCursorTelemetrySamples(parsed);+ const rawSamples = Array.isArray(parsed)+ ? parsed+ : Array.isArray(parsed?.samples)+ ? parsed.samples+ : [];++ const samples: CursorTelemetryPoint[] = rawSamples+ .filter((sample: unknown) => Boolean(sample && typeof sample === "object"))+ .map((sample: unknown) => {+ const point = sample as Partial<CursorTelemetryPoint>;+ return {+ timeMs:+ typeof point.timeMs === "number" && Number.isFinite(point.timeMs)+ ? Math.max(0, point.timeMs)+ : 0,+ cx:+ typeof point.cx === "number" && Number.isFinite(point.cx)+ ? clamp(point.cx, 0, 1)+ : 0.5,+ cy:+ typeof point.cy === "number" && Number.isFinite(point.cy)+ ? clamp(point.cy, 0, 1)+ : 0.5,+ interactionType:+ point.interactionType === "click" ||+ point.interactionType === "double-click" ||+ point.interactionType === "right-click" ||+ point.interactionType === "middle-click" ||+ point.interactionType === "move" ||+ point.interactionType === "mouseup"+ ? point.interactionType+ : undefined,+ cursorType:+ point.cursorType === "arrow" ||+ point.cursorType === "text" ||+ point.cursorType === "pointer" ||+ point.cursorType === "crosshair" ||+ point.cursorType === "open-hand" ||+ point.cursorType === "closed-hand" ||+ point.cursorType === "resize-ew" ||+ point.cursorType === "resize-ns" ||+ point.cursorType === "not-allowed"+ ? point.cursorType+ : undefined,+ };+ })+ .sort((a: CursorTelemetryPoint, b: CursorTelemetryPoint) => a.timeMs - b.timeMs);return { success: true, samples };} catch (error) {@@ -1352,32 +1405,4 @@ export function registerRecordingHandlers(};}});-- ipcMain.handle(- "set-cursor-telemetry",- async (_, videoPath: string | undefined, samples: CursorTelemetryPoint[]) => {- const targetVideoPath = normalizeVideoSourcePath(videoPath ?? currentVideoPath);- if (!targetVideoPath) {- return {- success: false,- samples: [],- message: "No video path available for cursor telemetry",- error: "Missing video path",- };- }-- try {- const normalizedSamples = await writeCursorTelemetry(targetVideoPath, samples);- return { success: true, samples: normalizedSamples };- } catch (error) {- console.error("Failed to save cursor telemetry:", error);- return {- success: false,- samples: [],- message: "Failed to save cursor telemetry",- error: String(error),- };- }- },- );}diff --git a/electron/ipc/types.ts b/electron/ipc/types.tsindex 58f5425b..7c7de9c1 100644--- a/electron/ipc/types.ts+++ b/electron/ipc/types.ts@@ -47,7 +47,6 @@ export type RecordingSessionData = {videoPath: string;webcamPath?: string | null;timeOffsetMs?: number;- hideOverlayCursorByDefault?: boolean;};export type PauseSegment = {diff --git a/electron/preload.ts b/electron/preload.tsindex 4d988b35..422ce2c5 100644--- a/electron/preload.ts+++ b/electron/preload.ts@@ -293,11 +293,11 @@ contextBridge.exposeInMainWorld("electronAPI", {resumeNativeScreenRecording: () => {return ipcRenderer.invoke("resume-native-screen-recording");},- pauseCursorCapture: () => {- return ipcRenderer.invoke("pause-cursor-capture");+ pauseCursorCapture: (boundaryMs?: number) => {+ return ipcRenderer.invoke("pause-cursor-capture", boundaryMs);},- resumeCursorCapture: () => {- return ipcRenderer.invoke("resume-cursor-capture");+ resumeCursorCapture: (boundaryMs?: number) => {+ return ipcRenderer.invoke("resume-cursor-capture", boundaryMs);},startFfmpegRecording: (source: ProcessedDesktopSource) => {return ipcRenderer.invoke("start-ffmpeg-recording", source);@@ -327,9 +327,6 @@ contextBridge.exposeInMainWorld("electronAPI", {getCursorTelemetry: (videoPath?: string) => {return ipcRenderer.invoke("get-cursor-telemetry", videoPath);},- setCursorTelemetry: (videoPath: string | undefined, samples: CursorTelemetryPoint[]) => {- return ipcRenderer.invoke("set-cursor-telemetry", videoPath, samples);- },getSystemCursorAssets: () => {return ipcRenderer.invoke("get-system-cursor-assets");},@@ -439,24 +436,14 @@ contextBridge.exposeInMainWorld("electronAPI", {}) => {return ipcRenderer.invoke("generate-auto-captions", options);},- setCurrentVideoPath: (- path: string,- options?: {- preserveProjectPath?: boolean;- hideOverlayCursorByDefault?: boolean;- },- ) => {+ setCurrentVideoPath: (path: string, options?: { preserveProjectPath?: boolean }) => {return ipcRenderer.invoke("set-current-video-path", path, options);},- setCurrentRecordingSession: (- session: {- videoPath: string;- webcamPath?: string | null;- timeOffsetMs?: number;- hideOverlayCursorByDefault?: boolean;- },- options?: { preserveProjectPath?: boolean },- ) => {+ setCurrentRecordingSession: (session: {+ videoPath: string;+ webcamPath?: string | null;+ timeOffsetMs?: number;+ }, options?: { preserveProjectPath?: boolean }) => {return ipcRenderer.invoke("set-current-recording-session", session, options);},getCurrentRecordingSession: () => {@@ -616,9 +603,6 @@ contextBridge.exposeInMainWorld("electronAPI", {getPlatform: () => {return ipcRenderer.invoke("get-platform");},- getLinuxWindowSystem: () => {- return ipcRenderer.invoke("get-linux-window-system");- },revealInFolder: (filePath: string) => {return ipcRenderer.invoke("reveal-in-folder", filePath);},diff --git a/src/components/video-editor/SettingsPanel.tsx b/src/components/video-editor/SettingsPanel.tsxindex 0b680c20..9b55f272 100644--- a/src/components/video-editor/SettingsPanel.tsx+++ b/src/components/video-editor/SettingsPanel.tsx@@ -1,11 +1,4 @@-import {- CursorClick,- Palette,- PresentationChart,- Trash as Trash2,- UploadSimple as Upload,- X,-} from "@phosphor-icons/react";+import { Palette, Trash as Trash2, UploadSimple as Upload, X } from "@phosphor-icons/react";import { AnimatePresence, LayoutGroup, motion } from "motion/react";import { useEffect, useMemo, useRef, useState } from "react";import { toast } from "sonner";@@ -26,10 +19,6 @@ import {getRenderableVideoUrl,getWallpaperThumbnailUrl,} from "@/lib/assetPath";-import {- TEMPORAL_MOTION_BLUR_DEFAULT_SAMPLE_COUNT,- TEMPORAL_MOTION_BLUR_DEFAULT_SHUTTER_FRACTION,-} from "@/lib/exporter/temporalMotionBlur";import type { ExtensionSettingField } from "@/lib/extensions";import { extensionHost, type FrameInstance } from "@/lib/extensions";import { cn } from "@/lib/utils";@@ -45,7 +34,6 @@ import { useI18n, useScopedT } from "../../contexts/I18nContext";import type { AppLocale } from "../../i18n/config";import { SUPPORTED_LOCALES } from "../../i18n/config";import { AnnotationSettingsPanel } from "./AnnotationSettingsPanel";-import { CURSOR_MOTION_PRESETS, type CursorMotionPresetId } from "./cursorMotionPresets";import { loadEditorPreferences, saveEditorPreferences } from "./editorPreferences";import { SliderControl } from "./SliderControl";import { KeyboardShortcutsDialog } from "./TutorialHelp";@@ -60,6 +48,7 @@ import type {EditorEffectSection,FigureData,Padding,+ PlaybackSpeed,WebcamOverlaySettings,WebcamPositionPreset,ZoomDepth,@@ -73,6 +62,7 @@ import {DEFAULT_CURSOR_CLICK_BOUNCE_DURATION,DEFAULT_CURSOR_MOTION_BLUR,DEFAULT_CURSOR_SIZE,+ DEFAULT_CURSOR_SMOOTHING,DEFAULT_CURSOR_STYLE,DEFAULT_CURSOR_SWAY,DEFAULT_PADDING,@@ -84,9 +74,8 @@ import {DEFAULT_WEBCAM_REACT_TO_ZOOM,DEFAULT_WEBCAM_SHADOW,DEFAULT_WEBCAM_SIZE,- DEFAULT_ZOOM_IN_DURATION_MS,- DEFAULT_ZOOM_SMOOTHNESS,- DEFAULT_ZOOM_OUT_DURATION_MS,+ DEFAULT_ZOOM_MOTION_BLUR,+ SPEED_OPTIONS,} from "./types";import { fromCursorSwaySliderValue, toCursorSwaySliderValue } from "./videoPlayback/cursorSway";import { isZeroPadding } from "./videoPlayback/layoutUtils";@@ -385,66 +374,6 @@ function ExtensionSettingsSection({);}-const MOTION_PRESET_ORDER: CursorMotionPresetId[] = ["focused", "smooth"];--function MotionPresetCards({- title,- activePresetId,- onApply,- tSettings,-}: {- title: string;- activePresetId: CursorMotionPresetId | null;- onApply: (presetId: CursorMotionPresetId) => void;- tSettings: (key: string, fallback?: string) => string;-}) {- return (- <div className="flex flex-col gap-2">- <div className="text-[10px] text-muted-foreground">{title}</div>- <div className="grid grid-cols-2 gap-2">- {MOTION_PRESET_ORDER.map((presetId) => {- const Icon = presetId === "focused" ? CursorClick : PresentationChart;- const isActive = activePresetId === presetId;-- return (- <button- key={presetId}- type="button"- onClick={() => onApply(presetId)}- className={cn(- "rounded-xl border px-3 py-3 text-left transition-all",- "border-foreground/10 bg-foreground/[0.03] hover:border-foreground/20 hover:bg-foreground/[0.06]",- isActive &&- "border-[#2563EB]/70 bg-[#2563EB]/12 shadow-[inset_0_0_0_1px_rgba(37,99,235,0.15)]",- )}- >- <div className="flex items-start gap-3">- <div- className={cn(- "mt-0.5 flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border border-foreground/10 bg-black/10 text-muted-foreground",- isActive &&- "border-[#2563EB]/30 bg-[#2563EB]/10 text-[#75A6FF]",- )}- >- <Icon className="h-4 w-4" />- </div>- <div className="min-w-0 flex-1">- <div className="text-[12px] font-medium text-foreground">- {tSettings(`effects.motionPresets.${presetId}.label`)}- </div>- </div>- </div>- <div className="mt-2 text-[10px] leading-4 text-muted-foreground">- {tSettings(`effects.motionPresets.${presetId}.description`)}- </div>- </button>- );- })}- </div>- </div>- );-}-interface SettingsPanelProps {panelMode?: "editor" | "background";activeEffectSection?: EditorEffectSection;@@ -456,6 +385,8 @@ interface SettingsPanelProps {selectedZoomMode?: ZoomMode | null;onZoomModeChange?: (mode: ZoomMode) => void;onZoomDelete?: (id: string) => void;+ selectedTrimId?: string | null;+ onTrimDelete?: (id: string) => void;selectedClipId?: string | null;selectedClipSpeed?: number | null;selectedClipMuted?: boolean | null;@@ -470,11 +401,8 @@ interface SettingsPanelProps {onShadowChange?: (intensity: number) => void;backgroundBlur?: number;onBackgroundBlurChange?: (amount: number) => void;- onZoomTemporalMotionBlurChange?: (amount: number) => void;- zoomMotionBlurSampleCount?: number | null;- onZoomMotionBlurSampleCountChange?: (count: number | null) => void;- zoomMotionBlurShutterFraction?: number | null;- onZoomMotionBlurShutterFractionChange?: (fraction: number | null) => void;+ zoomMotionBlur?: number;+ onZoomMotionBlurChange?: (amount: number) => void;connectZooms?: boolean;onConnectZoomsChange?: (enabled: boolean) => void;autoApplyFreshRecordingAutoZooms?: boolean;@@ -505,12 +433,8 @@ interface SettingsPanelProps {onCursorSizeChange?: (size: number) => void;cursorSmoothing?: number;onCursorSmoothingChange?: (smoothing: number) => void;- cursorSpringStiffnessMultiplier?: number;- onCursorSpringStiffnessMultiplierChange?: (multiplier: number) => void;- cursorSpringDampingMultiplier?: number;- onCursorSpringDampingMultiplierChange?: (multiplier: number) => void;- cursorSpringMassMultiplier?: number;- onCursorSpringMassMultiplierChange?: (multiplier: number) => void;+ zoomSmoothness?: number;+ onZoomSmoothnessChange?: (smoothness: number) => void;zoomClassicMode?: boolean;onZoomClassicModeChange?: (enabled: boolean) => void;cursorMotionBlur?: number;@@ -558,6 +482,10 @@ interface SettingsPanelProps {onClearAutoCaptions?: () => void;onDownloadWhisperSmallModel?: () => void;onDeleteWhisperSmallModel?: () => void;+ selectedSpeedId?: string | null;+ selectedSpeedValue?: PlaybackSpeed | null;+ onSpeedChange?: (speed: PlaybackSpeed) => void;+ onSpeedDelete?: (id: string) => void;}const ZOOM_DEPTH_OPTIONS: Array<{ depth: ZoomDepth; label: string }> = [@@ -835,6 +763,8 @@ export function SettingsPanel({selectedZoomMode,onZoomModeChange,onZoomDelete,+ selectedTrimId,+ onTrimDelete,selectedClipId,selectedClipSpeed,selectedClipMuted,@@ -849,17 +779,12 @@ export function SettingsPanel({onShadowChange,backgroundBlur = 0,onBackgroundBlurChange,- onZoomTemporalMotionBlurChange,- onZoomMotionBlurSampleCountChange,- onZoomMotionBlurShutterFractionChange,+ zoomMotionBlur = 0,+ onZoomMotionBlurChange,connectZooms = true,onConnectZoomsChange,autoApplyFreshRecordingAutoZooms = true,onAutoApplyFreshRecordingAutoZoomsChange,- zoomInDurationMs = DEFAULT_ZOOM_IN_DURATION_MS,- onZoomInDurationMsChange,- zoomOutDurationMs = DEFAULT_ZOOM_OUT_DURATION_MS,- onZoomOutDurationMsChange,showCursor = false,onShowCursorChange,loopCursor = false,@@ -870,12 +795,8 @@ export function SettingsPanel({onCursorSizeChange,cursorSmoothing = 2,onCursorSmoothingChange,- cursorSpringStiffnessMultiplier = 1,- onCursorSpringStiffnessMultiplierChange,- cursorSpringDampingMultiplier = 1,- onCursorSpringDampingMultiplierChange,- cursorSpringMassMultiplier = 1,- onCursorSpringMassMultiplierChange,+ zoomSmoothness = 0.5,+ onZoomSmoothnessChange,zoomClassicMode = false,onZoomClassicModeChange,cursorMotionBlur = DEFAULT_CURSOR_MOTION_BLUR,@@ -921,6 +842,10 @@ export function SettingsPanel({onClearAutoCaptions,onDownloadWhisperSmallModel,onDeleteWhisperSmallModel,+ selectedSpeedId,+ selectedSpeedValue,+ onSpeedChange,+ onSpeedDelete,}: SettingsPanelProps) {const tSettings = useScopedT("settings");const { locale, setLocale, t } = useI18n();@@ -1401,6 +1326,12 @@ export function SettingsPanel({</div>);+ const handleTrimDeleteClick = () => {+ if (selectedTrimId && onTrimDelete) {+ onTrimDelete(selectedTrimId);+ }+ };+const crop = cropRegion ?? {x: 0,y: 0,@@ -1447,13 +1378,8 @@ export function SettingsPanel({};const resetZoomSection = () => {- onZoomTemporalMotionBlurChange?.(initialEditorPreferences.zoomTemporalMotionBlur);- onZoomMotionBlurSampleCountChange?.(initialEditorPreferences.zoomMotionBlurSampleCount);- onZoomMotionBlurShutterFractionChange?.(- initialEditorPreferences.zoomMotionBlurShutterFraction,- );- onZoomInDurationMsChange?.(initialEditorPreferences.zoomInDurationMs);- onZoomOutDurationMsChange?.(initialEditorPreferences.zoomOutDurationMs);+ onZoomSmoothnessChange?.(0.5);+ onZoomMotionBlurChange?.(initialEditorPreferences.zoomMotionBlur);onZoomClassicModeChange?.(false);};@@ -1463,66 +1389,17 @@ export function SettingsPanel({onCursorStyleChange?.(initialEditorPreferences.cursorStyle);onCursorSizeChange?.(initialEditorPreferences.cursorSize);onCursorSmoothingChange?.(initialEditorPreferences.cursorSmoothing);- onCursorSpringStiffnessMultiplierChange?.(- initialEditorPreferences.cursorSpringStiffnessMultiplier,- );- onCursorSpringDampingMultiplierChange?.(- initialEditorPreferences.cursorSpringDampingMultiplier,- );- onCursorSpringMassMultiplierChange?.(initialEditorPreferences.cursorSpringMassMultiplier);onCursorMotionBlurChange?.(initialEditorPreferences.cursorMotionBlur);onCursorClickBounceChange?.(initialEditorPreferences.cursorClickBounce);onCursorClickBounceDurationChange?.(DEFAULT_CURSOR_CLICK_BOUNCE_DURATION);onCursorSwayChange?.(initialEditorPreferences.cursorSway);};- const activeMotionPresetId = useMemo(() => {- return (- MOTION_PRESET_ORDER.find((presetId) => {- const preset = CURSOR_MOTION_PRESETS[presetId];- return (- preset.zoomSmoothness === DEFAULT_ZOOM_SMOOTHNESS &&- preset.zoomInDurationMs === zoomInDurationMs &&- preset.zoomOutDurationMs === zoomOutDurationMs &&- preset.cursorSize === cursorSize &&- preset.cursorSmoothing === cursorSmoothing &&- preset.cursorSpringStiffnessMultiplier === cursorSpringStiffnessMultiplier &&- preset.cursorSpringDampingMultiplier === cursorSpringDampingMultiplier &&- preset.cursorSpringMassMultiplier === cursorSpringMassMultiplier &&- preset.cursorMotionBlur === cursorMotionBlur &&- preset.cursorClickBounce === cursorClickBounce &&- preset.cursorClickBounceDuration === cursorClickBounceDuration- );- }) ?? null- );- }, [- cursorClickBounce,- cursorClickBounceDuration,- cursorMotionBlur,- cursorSize,- cursorSmoothing,- cursorSpringDampingMultiplier,- cursorSpringMassMultiplier,- cursorSpringStiffnessMultiplier,- zoomInDurationMs,- zoomOutDurationMs,- ]);-- const applyMotionPreset = (presetId: CursorMotionPresetId) => {- const preset = CURSOR_MOTION_PRESETS[presetId];- onZoomInDurationMsChange?.(preset.zoomInDurationMs);- onZoomOutDurationMsChange?.(preset.zoomOutDurationMs);- onCursorSizeChange?.(preset.cursorSize);- onCursorSmoothingChange?.(preset.cursorSmoothing);- onCursorSpringStiffnessMultiplierChange?.(preset.cursorSpringStiffnessMultiplier);- onCursorSpringDampingMultiplierChange?.(preset.cursorSpringDampingMultiplier);- onCursorSpringMassMultiplierChange?.(preset.cursorSpringMassMultiplier);- onCursorMotionBlurChange?.(preset.cursorMotionBlur);- onCursorClickBounceChange?.(preset.cursorClickBounce);- onCursorClickBounceDurationChange?.(preset.cursorClickBounceDuration);- };-const resetFrameSection = () => {+ onShadowChange?.(initialEditorPreferences.shadowIntensity);+ onBorderRadiusChange?.(initialEditorPreferences.borderRadius);+ onPaddingChange?.(DEFAULT_PADDING);+ onFrameChange?.(null);onAspectRatioChange?.(initialEditorPreferences.aspectRatio);removeBackgroundStateRef.current = null;};@@ -2025,14 +1902,8 @@ export function SettingsPanel({className="text-[10px] text-[#2563EB] transition-opacity hover:opacity-80"title={padding.linked === false- ? tSettings(- "effects.paddingAdvancedHide",- "Hide advanced padding controls",- )- : tSettings(- "effects.paddingAdvancedShow",- "Show advanced padding controls",- )+ ? tSettings("effects.paddingAdvancedHide", "Hide advanced padding controls")+ : tSettings("effects.paddingAdvancedShow", "Show advanced padding controls")}>{tSettings("effects.paddingAdvanced", "Advanced")}@@ -2555,15 +2426,6 @@ export function SettingsPanel({</div></section>- <section className="flex flex-col gap-2">- <MotionPresetCards- title={tSettings("effects.motionPresetsTitle", "Motion Presets")}- activePresetId={activeMotionPresetId}- onApply={applyMotionPreset}- tSettings={tSettings}- />- </section>-<section className="flex flex-col gap-2"><SectionLabel>{t("editor.keyboardShortcuts.title")}</SectionLabel><KeyboardShortcutsDialog@@ -2634,7 +2496,7 @@ export function SettingsPanel({): tSettings("zoom.modeAutoDescription",- "Camera recenters when the cursor nears the edge of the zoomed view",+ "Camera follows cursor automatically",)}</p></div>@@ -2684,21 +2546,29 @@ export function SettingsPanel({/></div>{!zoomClassicMode && (- <div className="text-[10px] text-muted-foreground">- {tSettings(- "effects.motionPresetsZoomHint",- "Zoom motion presets are available in Settings.",- )}- </div>+ <SliderControl+ label={tSettings("effects.zoomSmoothness", "Zoom Smoothness")}+ value={zoomSmoothness}+ defaultValue={0.5}+ min={0}+ max={1}+ step={0.01}+ onChange={(v) => onZoomSmoothnessChange?.(v)}+ formatValue={(v) => (v <= 0 ? tSettings("effects.off") : v.toFixed(2))}+ parseInput={(text) => parseFloat(text)}+ />)}- <div className="rounded-lg border border-foreground/10 bg-foreground/[0.03] px-3 py-2">- <div className="text-[10px] text-muted-foreground">- {tSettings("effects.exportBlurLocked", "Export blur is fixed for this build.")}- </div>- <div className="mt-1 text-[12px] font-medium text-foreground">- {`${TEMPORAL_MOTION_BLUR_DEFAULT_SAMPLE_COUNT} samples · ${Math.round(TEMPORAL_MOTION_BLUR_DEFAULT_SHUTTER_FRACTION * 100)}% shutter`}- </div>- </div>+ <SliderControl+ label={tSettings("effects.zoomMotionBlur")}+ value={zoomMotionBlur}+ defaultValue={DEFAULT_ZOOM_MOTION_BLUR}+ min={0}+ max={2}+ step={0.05}+ onChange={(v) => onZoomMotionBlurChange?.(v)}+ formatValue={(v) => `${v.toFixed(2)}×`}+ parseInput={(text) => parseFloat(text.replace(/×$/, ""))}+ />{selectedZoomId && (<ButtononClick={() => {@@ -2889,6 +2759,19 @@ export function SettingsPanel({formatValue={(v) => `${v.toFixed(2)}×`}parseInput={(text) => parseFloat(text.replace(/×$/, ""))}/>+ <SliderControl+ label={tSettings("effects.cursorSmoothing")}+ value={cursorSmoothing}+ defaultValue={DEFAULT_CURSOR_SMOOTHING}+ min={0}+ max={2}+ step={0.01}+ onChange={(v) => onCursorSmoothingChange?.(v)}+ formatValue={(v) =>+ v <= 0 ? tSettings("effects.off") : v.toFixed(2)+ }+ parseInput={(text) => parseFloat(text)}+ /><SliderControllabel={tSettings("effects.cursorMotionBlur")}value={cursorMotionBlur}@@ -3194,9 +3077,70 @@ export function SettingsPanel({<divclassName={cn("flex-shrink-0 border-t border-foreground/10 bg-editor-header p-4 pt-3",- !selectedAudioId && "hidden",+ !selectedTrimId && !selectedSpeedId && !selectedAudioId && "hidden",)}>+ {selectedTrimId && (+ <div className="mb-4">+ <Button+ onClick={handleTrimDeleteClick}+ variant="destructive"+ size="sm"+ className="mt-2 h-8 w-full gap-2 border border-red-500/20 bg-red-500/10 text-xs text-red-400 transition-all hover:border-red-500/30 hover:bg-red-500/20"+ >+ <Trash2 className="h-3 w-3" />+ {tSettings("trim.deleteRegion")}+ </Button>+ </div>+ )}++ {selectedSpeedId && (+ <div>+ <div className="mb-3 flex items-center justify-between">+ <span className="text-sm font-medium text-foreground">+ {tSettings("speed.playbackSpeed")}+ </span>+ {selectedSpeedValue && (+ <span className="rounded-full bg-[#d97706]/10 px-2 py-0.5 text-[10px] font-medium uppercase tracking-wider text-[#d97706]">+ {SPEED_OPTIONS.find((o) => o.speed === selectedSpeedValue)+ ?.label ?? `${selectedSpeedValue}×`}+ </span>+ )}+ </div>+ <div className="grid grid-cols-7 gap-1.5">+ {SPEED_OPTIONS.map((option) => {+ const isActive = selectedSpeedValue === option.speed;+ return (+ <Button+ key={option.speed}+ type="button"+ onClick={() => onSpeedChange?.(option.speed)}+ className={cn(+ "h-auto w-full rounded-lg border px-1 py-2 text-center shadow-sm transition-all duration-200 ease-out cursor-pointer",+ isActive+ ? "border-[#d97706] bg-[#d97706] text-white"+ : "border-foreground/5 bg-foreground/5 text-muted-foreground hover:bg-foreground/10 hover:border-foreground/10 hover:text-foreground",+ )}+ >+ <span className="text-xs font-semibold">+ {option.label}+ </span>+ </Button>+ );+ })}+ </div>+ <Button+ onClick={() => selectedSpeedId && onSpeedDelete?.(selectedSpeedId)}+ variant="destructive"+ size="sm"+ className="mt-2 h-8 w-full gap-2 border border-red-500/20 bg-red-500/10 text-xs text-red-400 transition-all hover:border-red-500/30 hover:bg-red-500/20"+ >+ <Trash2 className="h-3 w-3" />+ {tSettings("speed.deleteRegion")}+ </Button>+ </div>+ )}+{selectedAudioId && (<div><div className="mb-3 flex items-center justify-between">diff --git a/src/components/video-editor/SliderControl.tsx b/src/components/video-editor/SliderControl.tsxindex d9db8998..2efafa2d 100644--- a/src/components/video-editor/SliderControl.tsx+++ b/src/components/video-editor/SliderControl.tsx@@ -1,5 +1,3 @@-import type { PointerEvent as ReactPointerEvent } from "react";-import { useCallback, useRef } from "react";import { cn } from "@/lib/utils";interface SliderControlProps {@@ -15,18 +13,6 @@ interface SliderControlProps {accentColor?: "purple" | "blue";}-function clamp(value: number, min: number, max: number) {- return Math.min(max, Math.max(min, value));-}--function quantizeToStep(value: number, min: number, step: number) {- if (!(step > 0)) {- return value;- }-- return min + Math.round((value - min) / step) * step;-}-export function SliderControl({label,value,@@ -39,94 +25,16 @@ export function SliderControl({parseInput: _parseInput,accentColor = "blue",}: SliderControlProps) {- const rootRef = useRef<HTMLDivElement | null>(null);const pct = Math.min(100, Math.max(0, ((value - min) / (max - min || 1)) * 100));const dividerClass =accentColor === "purple"? "bg-foreground/95 shadow-[0_0_10px_rgba(139,92,246,0.28)]": "bg-foreground/95 shadow-[0_0_10px_rgba(37,99,235,0.28)]";- const setValueFromClientX = useCallback(- (clientX: number) => {- const root = rootRef.current;- if (!root) {- return;- }-- const bounds = root.getBoundingClientRect();- if (!(bounds.width > 0)) {- return;- }-- const normalized = clamp((clientX - bounds.left) / bounds.width, 0, 1);- const rawValue = min + normalized * (max - min);- const nextValue = clamp(quantizeToStep(rawValue, min, step), min, max);- onChange(Number(nextValue.toFixed(6)));- },- [max, min, onChange, step],- );-- const handlePointerDown = useCallback(- (event: ReactPointerEvent<HTMLDivElement>) => {- event.preventDefault();- const pointerId = event.pointerId;- const target = event.currentTarget;-- target.setPointerCapture(pointerId);- setValueFromClientX(event.clientX);-- const handlePointerMove = (moveEvent: PointerEvent) => {- if (moveEvent.pointerId !== pointerId) {- return;- }-- setValueFromClientX(moveEvent.clientX);- };-- const finishPointer = (finishEvent: PointerEvent) => {- if (finishEvent.pointerId !== pointerId) {- return;- }-- target.releasePointerCapture(pointerId);- target.removeEventListener("pointermove", handlePointerMove);- target.removeEventListener("pointerup", finishPointer);- target.removeEventListener("pointercancel", finishPointer);- };-- target.addEventListener("pointermove", handlePointerMove);- target.addEventListener("pointerup", finishPointer);- target.addEventListener("pointercancel", finishPointer);- },- [setValueFromClientX],- );-return (- <div- ref={rootRef}- role="slider"- tabIndex={0}- aria-label={label}- aria-valuemin={min}- aria-valuemax={max}- aria-valuenow={value}- aria-valuetext={formatValue(value)}- onPointerDown={handlePointerDown}- onKeyDown={(event) => {- if (event.key === "ArrowLeft" || event.key === "ArrowDown") {- event.preventDefault();- onChange(clamp(quantizeToStep(value - step, min, step), min, max));- }-- if (event.key === "ArrowRight" || event.key === "ArrowUp") {- event.preventDefault();- onChange(clamp(quantizeToStep(value + step, min, step), min, max));- }- }}- className="relative flex h-10 w-full select-none items-center overflow-hidden rounded-xl bg-editor-bg/80 px-1.5 outline-none focus-visible:ring-1 focus-visible:ring-[#2563EB]/40"- >+ <div className="relative flex h-10 w-full select-none items-center overflow-hidden rounded-xl bg-editor-bg/80 px-1.5"><div- className="pointer-events-none absolute inset-y-[3px] left-[3px] right-auto rounded-[10px] bg-foreground/[0.08] shadow-[0_4px_10px_0_rgba(0,0,0,0.18)] transition-none"+ className="absolute inset-y-[3px] left-[3px] right-auto rounded-[10px] bg-foreground/[0.08] shadow-[0_4px_10px_0_rgba(0,0,0,0.18)] transition-none"style={{width: pct > 0 ? `max(calc(${pct}% - 6px), 2.1rem)` : 0,}}@@ -144,6 +52,17 @@ export function SliderControl({<span className="pointer-events-none relative z-10 pr-3 text-[12px] font-medium tabular-nums text-foreground">{formatValue(value)}</span>+ <input+ type="range"+ min={min}+ max={max}+ step={step}+ value={value}+ onChange={(e) => onChange(Number(e.target.value))}+ aria-label={label}+ aria-valuetext={formatValue(value)}+ className="absolute inset-0 h-full w-full cursor-ew-resize opacity-0"+ /></div>);}diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsxindex 979efb53..13c3440a 100644--- a/src/components/video-editor/VideoEditor.tsx+++ b/src/components/video-editor/VideoEditor.tsx@@ -1,4 +1,5 @@import {+ BookmarkSimple,Check,CaretDown as ChevronDown,CaretUp as ChevronUp,@@ -38,6 +39,8 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from "@/components/ui/dropdown-menu";+import { Input } from "@/components/ui/input";+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";import { Toaster } from "@/components/ui/sonner";import { useI18n } from "@/contexts/I18nContext";import { useShortcuts } from "@/contexts/ShortcutsContext";@@ -77,6 +80,7 @@ import {getAspectRatioLabel,getAspectRatioValue,} from "@/utils/aspectRatioUtils";+import { cn } from "@/lib/utils";import { ExtensionIcon } from "./ExtensionIcon";const PhCursorFill = (props: { className?: string; weight?: "fill" | "regular" }) => (@@ -101,9 +105,18 @@ const PhSettings = (props: { className?: string; weight?: "fill" | "regular" })import { extensionHost } from "@/lib/extensions";import { resolveAutoCaptionSourcePath } from "./autoCaptionSource";import { CropControl } from "./CropControl";+import { updateCaptionCuesForEditedTarget, type CaptionEditTarget } from "./captionEditing";import { ExportSettingsMenu } from "./ExportSettingsMenu";import ExtensionManager from "./ExtensionManager";-import { loadEditorPreferences, saveEditorPreferences } from "./editorPreferences";+import {+ loadEditorPreferences,+ loadEditorPresets,+ saveEditorPreferences,+ saveEditorPresets,+ serializeEditorPresetSnapshot,+ type EditorPreset,+ type EditorPresetSnapshot,+} from "./editorPreferences";import ProjectBrowserDialog, { type ProjectLibraryEntry } from "./ProjectBrowserDialog";import {createProjectData,@@ -147,6 +160,7 @@ import {DEFAULT_CROP_REGION,DEFAULT_CURSOR_STYLE,DEFAULT_FIGURE_DATA,+ DEFAULT_PLAYBACK_SPEED,DEFAULT_WEBCAM_OVERLAY,DEFAULT_WEBCAM_TIME_OFFSET_MS,DEFAULT_ZOOM_IN_DURATION_MS,@@ -158,12 +172,10 @@ import {extendAutoFullTrackClip,type FigureData,getClipSourceEndMs,- mapSourceTimeToTimelineTime as resolveSourceTimeToTimelineTime,- mapTimelineTimeToSourceTime as resolveTimelineTimeToSourceTime,type Padding,+ type PlaybackSpeed,type SpeedRegion,type TrimRegion,- trimsToClips,type WebcamOverlaySettings,type ZoomDepth,type ZoomFocus,@@ -185,7 +197,9 @@ type EditorHistorySnapshot = {audioRegions: AudioRegion[];autoCaptions: CaptionCue[];selectedZoomId: string | null;+ selectedTrimId: string | null;selectedClipId: string | null;+ selectedSpeedId: string | null;selectedAnnotationId: string | null;selectedAudioId: string | null;};@@ -601,9 +615,11 @@ export default function VideoEditor() {const [cursorTelemetrySourcePath, setCursorTelemetrySourcePath] = useState<string | null>(null);const [selectedZoomId, setSelectedZoomId] = useState<string | null>(null);const [trimRegions, setTrimRegions] = useState<TrimRegion[]>([]);+ const [selectedTrimId, setSelectedTrimId] = useState<string | null>(null);const [clipRegions, setClipRegions] = useState<ClipRegion[]>([]);const [selectedClipId, setSelectedClipId] = useState<string | null>(null);const [speedRegions, setSpeedRegions] = useState<SpeedRegion[]>([]);+ const [selectedSpeedId, setSelectedSpeedId] = useState<string | null>(null);const [annotationRegions, setAnnotationRegions] = useState<AnnotationRegion[]>([]);const [selectedAnnotationId, setSelectedAnnotationId] = useState<string | null>(null);const [audioRegions, setAudioRegions] = useState<AudioRegion[]>([]);@@ -666,6 +682,10 @@ export default function VideoEditor() {const [exportedFilePath, setExportedFilePath] = useState<string | undefined>(undefined);const [hasPendingExportSave, setHasPendingExportSave] = useState(false);const [lastSavedSnapshot, setLastSavedSnapshot] = useState<EditorProjectData | null>(null);+ const [editorPresets, setEditorPresets] = useState<EditorPreset[]>(() => loadEditorPresets());+ const [activeEditorPresetId, setActiveEditorPresetId] = useState<string | null>(null);+ const [presetPopoverOpen, setPresetPopoverOpen] = useState(false);+ const [presetNameDraft, setPresetNameDraft] = useState("");const [showCropModal, setShowCropModal] = useState(false);const [previewVersion, setPreviewVersion] = useState(0);const [isPreviewReady, setIsPreviewReady] = useState(false);@@ -677,7 +697,9 @@ export default function VideoEditor() {const projectBrowserFallbackTriggerRef = useRef<HTMLButtonElement | null>(null);const projectNameInputRef = useRef<HTMLInputElement | null>(null);const nextZoomIdRef = useRef(1);+ const nextTrimIdRef = useRef(1);const nextClipIdRef = useRef(1);+ const nextSpeedIdRef = useRef(1);const nextAudioIdRef = useRef(1);const { shortcuts, isMac } = useShortcuts();@@ -743,6 +765,285 @@ export default function VideoEditor() {setHistoryVersion((version) => version + 1);}, []);+ const captureEditorPresetSnapshot = useCallback(+ (): EditorPresetSnapshot => ({+ wallpaper,+ shadowIntensity,+ backgroundBlur,+ zoomMotionBlur,+ connectZooms,+ zoomInDurationMs,+ zoomInOverlapMs,+ zoomOutDurationMs,+ connectedZoomGapMs,+ connectedZoomDurationMs,+ zoomInEasing,+ zoomOutEasing,+ connectedZoomEasing,+ showCursor,+ loopCursor,+ cursorStyle,+ cursorSize,+ cursorSmoothing,+ cursorMotionBlur,+ cursorClickBounce,+ cursorClickBounceDuration,+ cursorSway,+ borderRadius,+ padding: { ...padding },+ frame,+ webcam: { ...webcam },+ aspectRatio,+ exportEncodingMode,+ exportBackendPreference,+ exportPipelineModel,+ exportQuality,+ mp4FrameRate,+ exportFormat,+ gifFrameRate,+ gifLoop,+ gifSizePreset,+ autoCaptionSettings: { ...autoCaptionSettings },+ whisperExecutablePath,+ whisperModelPath,+ }),+ [+ wallpaper,+ shadowIntensity,+ backgroundBlur,+ zoomMotionBlur,+ connectZooms,+ zoomInDurationMs,+ zoomInOverlapMs,+ zoomOutDurationMs,+ connectedZoomGapMs,+ connectedZoomDurationMs,+ zoomInEasing,+ zoomOutEasing,+ connectedZoomEasing,+ showCursor,+ loopCursor,+ cursorStyle,+ cursorSize,+ cursorSmoothing,+ cursorMotionBlur,+ cursorClickBounce,+ cursorClickBounceDuration,+ cursorSway,+ borderRadius,+ padding,+ frame,+ webcam,+ aspectRatio,+ exportEncodingMode,+ exportBackendPreference,+ exportPipelineModel,+ exportQuality,+ mp4FrameRate,+ exportFormat,+ gifFrameRate,+ gifLoop,+ gifSizePreset,+ autoCaptionSettings,+ whisperExecutablePath,+ whisperModelPath,+ ],+ );++ const currentPresetSnapshot = useMemo(+ () => captureEditorPresetSnapshot(),+ [captureEditorPresetSnapshot],+ );+ const currentPresetSignature = useMemo(+ () => serializeEditorPresetSnapshot(currentPresetSnapshot),+ [currentPresetSnapshot],+ );+ const currentEditorPreset = useMemo(+ () => editorPresets.find((preset) => preset.id === activeEditorPresetId) ?? null,+ [activeEditorPresetId, editorPresets],+ );++ useEffect(() => {+ const activePreset = currentEditorPreset;+ if (+ activePreset &&+ serializeEditorPresetSnapshot(activePreset.snapshot) === currentPresetSignature+ ) {+ return;+ }++ const matchingPreset =+ editorPresets.find(+ (preset) =>+ serializeEditorPresetSnapshot(preset.snapshot) === currentPresetSignature,+ ) ?? null;+ const nextActivePresetId = matchingPreset?.id ?? null;+ if (nextActivePresetId !== activeEditorPresetId) {+ setActiveEditorPresetId(nextActivePresetId);+ }+ }, [activeEditorPresetId, currentEditorPreset, currentPresetSignature, editorPresets]);++ useEffect(() => {+ if (!presetPopoverOpen) {+ setPresetNameDraft("");+ }+ }, [presetPopoverOpen]);++ const applyEditorPresetSnapshot = useCallback((snapshot: EditorPresetSnapshot) => {+ setWallpaper(snapshot.wallpaper);+ setShadowIntensity(snapshot.shadowIntensity);+ setBackgroundBlur(snapshot.backgroundBlur);+ setZoomMotionBlur(snapshot.zoomMotionBlur);+ setConnectZooms(snapshot.connectZooms);+ setZoomInDurationMs(snapshot.zoomInDurationMs);+ setZoomInOverlapMs(snapshot.zoomInOverlapMs);+ setZoomOutDurationMs(snapshot.zoomOutDurationMs);+ setConnectedZoomGapMs(snapshot.connectedZoomGapMs);+ setConnectedZoomDurationMs(snapshot.connectedZoomDurationMs);+ setZoomInEasing(snapshot.zoomInEasing);+ setZoomOutEasing(snapshot.zoomOutEasing);+ setConnectedZoomEasing(snapshot.connectedZoomEasing);+ setShowCursor(snapshot.showCursor);+ setLoopCursor(snapshot.loopCursor);+ setCursorStyle(snapshot.cursorStyle);+ setCursorSize(snapshot.cursorSize);+ setCursorSmoothing(snapshot.cursorSmoothing);+ setCursorMotionBlur(snapshot.cursorMotionBlur);+ setCursorClickBounce(snapshot.cursorClickBounce);+ setCursorClickBounceDuration(snapshot.cursorClickBounceDuration);+ setCursorSway(snapshot.cursorSway);+ setBorderRadius(snapshot.borderRadius);+ setPadding({ ...snapshot.padding });+ setFrame(snapshot.frame);+ setWebcam({ ...snapshot.webcam });+ setAspectRatio(snapshot.aspectRatio);+ setExportEncodingMode(snapshot.exportEncodingMode);+ setExportBackendPreference(snapshot.exportBackendPreference);+ setExportPipelineModel(snapshot.exportPipelineModel);+ setExportQuality(snapshot.exportQuality);+ setMp4FrameRate(snapshot.mp4FrameRate);+ setExportFormat(snapshot.exportFormat);+ setGifFrameRate(snapshot.gifFrameRate);+ setGifLoop(snapshot.gifLoop);+ setGifSizePreset(snapshot.gifSizePreset);+ setAutoCaptionSettings({ ...snapshot.autoCaptionSettings });+ setWhisperExecutablePath(snapshot.whisperExecutablePath);+ setWhisperModelPath(snapshot.whisperModelPath);+ }, []);++ const handleApplyEditorPreset = useCallback(+ (presetId: string) => {+ const preset = editorPresets.find((item) => item.id === presetId);+ if (!preset) {+ return;+ }++ setActiveEditorPresetId(preset.id);+ applyEditorPresetSnapshot(preset.snapshot);+ toast.success(+ t("editor.presets.toasts.applied", "Applied preset \"{{name}}\"", {+ name: preset.name,+ }),+ );+ },+ [applyEditorPresetSnapshot, editorPresets, t],+ );++ const handleSaveEditorPreset = useCallback(+ (name: string) => {+ const normalizedName = name.trim().replace(/\s+/g, " ");+ if (normalizedName.length === 0) {+ toast.error(t("editor.presets.errors.nameRequired", "Enter a preset name."));+ return false;+ }++ const hasDuplicateName = editorPresets.some(+ (preset) => preset.name.toLocaleLowerCase() === normalizedName.toLocaleLowerCase(),+ );+ if (hasDuplicateName) {+ toast.error(+ t(+ "editor.presets.errors.duplicateName",+ "A preset with that name already exists.",+ ),+ );+ return false;+ }++ const snapshot = captureEditorPresetSnapshot();+ const timestamp = new Date().toISOString();+ const nextPreset: EditorPreset = {+ id: crypto.randomUUID(),+ name: normalizedName,+ createdAt: timestamp,+ updatedAt: timestamp,+ snapshot,+ };+ const nextPresets = [+ nextPreset,+ ...editorPresets,+ ];++ if (!saveEditorPresets(nextPresets)) {+ toast.error(+ t(+ "editor.presets.errors.saveFailed",+ "Could not save that preset. Check your browser storage settings and try again.",+ ),+ );+ return false;+ }++ setEditorPresets(nextPresets);+ setActiveEditorPresetId(nextPreset.id);+ toast.success(+ t("editor.presets.toasts.saved", "Saved preset \"{{name}}\"", {+ name: normalizedName,+ }),+ );+ return true;+ },+ [captureEditorPresetSnapshot, editorPresets, t],+ );++ const handleDeleteEditorPreset = useCallback(+ (presetId: string) => {+ const preset = editorPresets.find((item) => item.id === presetId);+ if (!preset) {+ return;+ }++ const nextPresets = editorPresets.filter((item) => item.id !== presetId);+ if (!saveEditorPresets(nextPresets)) {+ toast.error(+ t(+ "editor.presets.errors.deleteFailed",+ "Could not delete that preset. Check your browser storage settings and try again.",+ ),+ );+ return;+ }++ setEditorPresets(nextPresets);+ if (preset.id === activeEditorPresetId) {+ setActiveEditorPresetId(null);+ }+ toast.success(+ t("editor.presets.toasts.deleted", "Deleted preset \"{{name}}\"", {+ name: preset.name,+ }),+ );+ },+ [activeEditorPresetId, editorPresets, t],+ );++ const handleSavePresetSubmit = useCallback(() => {+ const didSave = handleSaveEditorPreset(presetNameDraft);+ if (didSave) {+ setPresetNameDraft("");+ }+ }, [handleSaveEditorPreset, presetNameDraft]);+const clearPendingExportSave = useCallback(() => {const pending = pendingExportSaveRef.current;pendingExportSaveRef.current = null;@@ -1472,7 +1773,9 @@ export default function VideoEditor() {audioRegions,autoCaptions,selectedZoomId,+ selectedTrimId,selectedClipId,+ selectedSpeedId,selectedAnnotationId,selectedAudioId,};@@ -1484,7 +1787,9 @@ export default function VideoEditor() {audioRegions,autoCaptions,selectedZoomId,+ selectedTrimId,selectedClipId,+ selectedSpeedId,selectedAnnotationId,selectedAudioId,]);@@ -1500,7 +1805,9 @@ export default function VideoEditor() {setAudioRegions(cloned.audioRegions);setAutoCaptions(cloned.autoCaptions);setSelectedZoomId(cloned.selectedZoomId);+ setSelectedTrimId(cloned.selectedTrimId);setSelectedClipId(cloned.selectedClipId);+ setSelectedSpeedId(cloned.selectedSpeedId);setSelectedAnnotationId(cloned.selectedAnnotationId);setSelectedAudioId(cloned.selectedAudioId);@@ -1512,6 +1819,10 @@ export default function VideoEditor() {"clip",cloned.clipRegions.map((region) => region.id),);+ nextSpeedIdRef.current = deriveNextId(+ "speed",+ cloned.speedRegions.map((region) => region.id),+ );nextAnnotationIdRef.current = deriveNextId("annotation",cloned.annotationRegions.map((region) => region.id),@@ -1643,7 +1954,9 @@ export default function VideoEditor() {setGifSizePreset(normalizedEditor.gifSizePreset);setSelectedZoomId(null);+ setSelectedTrimId(null);setSelectedClipId(null);+ setSelectedSpeedId(null);setSelectedAnnotationId(null);setSelectedAudioId(null);@@ -1651,10 +1964,18 @@ export default function VideoEditor() {"zoom",normalizedEditor.zoomRegions.map((region) => region.id),);+ nextTrimIdRef.current = deriveNextId(+ "trim",+ normalizedEditor.trimRegions.map((region) => region.id),+ );nextClipIdRef.current = deriveNextId("clip",normalizedEditor.clipRegions.map((region: ClipRegion) => region.id),);+ nextSpeedIdRef.current = deriveNextId(+ "speed",+ normalizedEditor.speedRegions.map((region) => region.id),+ );nextAudioIdRef.current = deriveNextId("audio",normalizedEditor.audioRegions.map((region) => region.id),@@ -1915,9 +2236,6 @@ export default function VideoEditor() {pendingFreshRecordingAutoZoomPathRef.current = autoApplyFreshRecordingAutoZooms? sourceVideoUrl: null;- if (sessionResult.session.hideOverlayCursorByDefault) {- setShowCursor(false);- }setWebcam((prev) => ({...prev,enabled: Boolean(sessionResult.session?.webcamPath),@@ -2250,6 +2568,14 @@ export default function VideoEditor() {setAutoCaptionSettings((prev) => ({ ...prev, enabled: false }));}, []);+ const handleSaveAutoCaptionEdit = useCallback(+ (target: CaptionEditTarget, text: string) => {+ setAutoCaptions((captions) => updateCaptionCuesForEditedTarget(captions, target, text));+ toast.success(t("settings.captions.editSaved", "Caption updated"));+ },+ [t],+ );+const saveProject = useCallback(async (forceSaveAs: boolean, options?: SaveProjectOptions) => {clearPendingProjectAutosave();@@ -2681,11 +3007,6 @@ export default function VideoEditor() {if (totalMs <= 0) return;if (!clipInitializedRef.current) {if (clipRegions.length === 0) {- if (trimRegions.length > 0) {- setClipRegions(trimsToClips(trimRegions, totalMs));- clipInitializedRef.current = true;- return;- }const id = `clip-${nextClipIdRef.current++}`;autoFullTrackClipIdRef.current = id;autoFullTrackClipEndMsRef.current = totalMs;@@ -2705,7 +3026,7 @@ export default function VideoEditor() {autoFullTrackClipEndMsRef.current = totalMs;setClipRegions(extendedClipRegions);- }, [duration, clipRegions, trimRegions]);+ }, [duration, clipRegions]);// Derive trimRegions from clipRegions so export/playback pipelines stay unchangeduseEffect(() => {@@ -2715,12 +3036,27 @@ export default function VideoEditor() {}, [clipRegions, duration]);const mapTimelineTimeToSourceTime = useCallback(- (timeMs: number) => resolveTimelineTimeToSourceTime(timeMs, clipRegions),+ (timeMs: number) => {+ for (const clip of clipRegions) {+ if (timeMs < clip.startMs || timeMs > clip.endMs) continue;+ const speed = Number.isFinite(clip.speed) && clip.speed > 0 ? clip.speed : 1;+ return Math.round(clip.startMs + (timeMs - clip.startMs) * speed);+ }+ return Math.round(timeMs);+ },[clipRegions],);const mapSourceTimeToTimelineTime = useCallback(- (timeMs: number) => resolveSourceTimeToTimelineTime(timeMs, clipRegions),+ (timeMs: number) => {+ for (const clip of clipRegions) {+ const sourceEndMs = getClipSourceEndMs(clip);+ if (timeMs < clip.startMs || timeMs > sourceEndMs) continue;+ const speed = Number.isFinite(clip.speed) && clip.speed > 0 ? clip.speed : 1;+ return Math.round(clip.startMs + (timeMs - clip.startMs) / speed);+ }+ return Math.round(timeMs);+ },[clipRegions],);@@ -2788,6 +3124,7 @@ export default function VideoEditor() {setSelectedZoomId(id);if (id) {setActiveEffectSection("zoom");+ setSelectedTrimId(null);setSelectedAnnotationId(null);setSelectedAudioId(null);} else {@@ -2795,10 +3132,20 @@ export default function VideoEditor() {}}, []);+ const handleSelectTrim = useCallback((id: string | null) => {+ setSelectedTrimId(id);+ if (id) {+ setSelectedZoomId(null);+ setSelectedAnnotationId(null);+ setSelectedAudioId(null);+ }+ }, []);+const handleSelectAnnotation = useCallback((id: string | null) => {setSelectedAnnotationId(id);if (id) {setSelectedZoomId(null);+ setSelectedTrimId(null);setSelectedAudioId(null);}}, []);@@ -2821,6 +3168,7 @@ export default function VideoEditor() {}setZoomRegions((prev) => [...prev, newRegion]);setSelectedZoomId(id);+ setSelectedTrimId(null);setSelectedAnnotationId(null);extensionHost.emitEvent({type: "timeline:region-added",@@ -2914,6 +3262,19 @@ export default function VideoEditor() {zoomRegions,]);+ const handleTrimAdded = useCallback((span: Span) => {+ const id = `trim-${nextTrimIdRef.current++}`;+ const newRegion: TrimRegion = {+ id,+ startMs: Math.round(span.start),+ endMs: Math.round(span.end),+ };+ setTrimRegions((prev) => [...prev, newRegion]);+ setSelectedTrimId(id);+ setSelectedZoomId(null);+ setSelectedAnnotationId(null);+ }, []);+const handleZoomSpanChange = useCallback((id: string, span: Span) => {setZoomRegions((prev) =>prev.map((region) =>@@ -2924,7 +3285,21 @@ export default function VideoEditor() {endMs: Math.round(span.end),}: region,- ),+ ),+ );+ }, []);++ const handleTrimSpanChange = useCallback((id: string, span: Span) => {+ setTrimRegions((prev) =>+ prev.map((region) =>+ region.id === id+ ? {+ ...region,+ startMs: Math.round(span.start),+ endMs: Math.round(span.end),+ }+ : region,+ ),);}, []);@@ -2980,6 +3355,16 @@ export default function VideoEditor() {[selectedZoomId],);+ const handleTrimDelete = useCallback(+ (id: string) => {+ setTrimRegions((prev) => prev.filter((region) => region.id !== id));+ if (selectedTrimId === id) {+ setSelectedTrimId(null);+ }+ },+ [selectedTrimId],+ );+const handleSelectClip = useCallback((id: string | null) => {setSelectedClipId(id);if (id) {@@ -3158,11 +3543,62 @@ export default function VideoEditor() {[clipRegions, selectedClipId],);+ const handleSelectSpeed = useCallback((id: string | null) => {+ setSelectedSpeedId(id);+ if (id) {+ setSelectedZoomId(null);+ setSelectedTrimId(null);+ setSelectedAnnotationId(null);+ setSelectedAudioId(null);+ }+ }, []);++ const handleSpeedAdded = useCallback((span: Span) => {+ const id = `speed-${nextSpeedIdRef.current++}`;+ const newRegion: SpeedRegion = {+ id,+ startMs: Math.round(span.start),+ endMs: Math.round(span.end),+ speed: DEFAULT_PLAYBACK_SPEED,+ };+ setSpeedRegions((prev) => [...prev, newRegion]);+ setSelectedSpeedId(id);+ setSelectedZoomId(null);+ setSelectedTrimId(null);+ setSelectedAnnotationId(null);+ }, []);++ const handleSpeedSpanChange = useCallback((id: string, span: Span) => {+ setSpeedRegions((prev) =>+ prev.map((region) =>+ region.id === id+ ? {+ ...region,+ startMs: Math.round(span.start),+ endMs: Math.round(span.end),+ }+ : region,+ ),+ );+ }, []);++ const handleSpeedDelete = useCallback(+ (id: string) => {+ setSpeedRegions((prev) => prev.filter((region) => region.id !== id));+ if (selectedSpeedId === id) {+ setSelectedSpeedId(null);+ }+ },+ [selectedSpeedId],+ );+const handleSelectAudio = useCallback((id: string | null) => {setSelectedAudioId(id);if (id) {setSelectedZoomId(null);+ setSelectedTrimId(null);setSelectedAnnotationId(null);+ setSelectedSpeedId(null);}}, []);@@ -3179,7 +3615,9 @@ export default function VideoEditor() {setAudioRegions((prev) => [...prev, newRegion]);setSelectedAudioId(id);setSelectedZoomId(null);+ setSelectedTrimId(null);setSelectedAnnotationId(null);+ setSelectedSpeedId(null);}, []);const handleAudioSpanChange = useCallback((id: string, span: Span, trackIndex?: number) => {@@ -3231,6 +3669,18 @@ export default function VideoEditor() {[selectedAudioId],);+ const handleSpeedChange = useCallback(+ (speed: PlaybackSpeed) => {+ if (!selectedSpeedId) return;+ setSpeedRegions((prev) =>+ prev.map((region) =>+ region.id === selectedSpeedId ? { ...region, speed } : region,+ ),+ );+ },+ [selectedSpeedId],+ );+const handleAnnotationAdded = useCallback((span: Span, trackIndex = 0) => {const id = `annotation-${nextAnnotationIdRef.current++}`;const zIndex = nextAnnotationZIndexRef.current++; // Assign z-index based on creation order@@ -3249,6 +3699,7 @@ export default function VideoEditor() {setAnnotationRegions((prev) => [...prev, newRegion]);setSelectedAnnotationId(id);setSelectedZoomId(null);+ setSelectedTrimId(null);}, []);const handleAnnotationSpanChange = useCallback(@@ -3449,6 +3900,12 @@ export default function VideoEditor() {}}, [selectedZoomId, zoomRegions]);+ useEffect(() => {+ if (selectedTrimId && !trimRegions.some((region) => region.id === selectedTrimId)) {+ setSelectedTrimId(null);+ }+ }, [selectedTrimId, trimRegions]);+useEffect(() => {if (selectedAnnotationId &&@@ -3458,6 +3915,12 @@ export default function VideoEditor() {}}, [selectedAnnotationId, annotationRegions]);+ useEffect(() => {+ if (selectedSpeedId && !speedRegions.some((region) => region.id === selectedSpeedId)) {+ setSelectedSpeedId(null);+ }+ }, [selectedSpeedId, speedRegions]);+useEffect(() => {if (selectedAudioId && !audioRegions.some((region) => region.id === selectedAudioId)) {setSelectedAudioId(null);@@ -3642,7 +4105,7 @@ export default function VideoEditor() {// Sync audio playback with video currentTime and isPlaying stateuseEffect(() => {const currentTimeMs = currentTime * 1000;- const activeSpeedRegion = effectiveSpeedRegions.find(+ const activeSpeedRegion = speedRegions.find((region) => currentTimeMs >= region.startMs && currentTimeMs < region.endMs,);const targetPlaybackRate = activeSpeedRegion ? activeSpeedRegion.speed : 1;@@ -3676,7 +4139,7 @@ export default function VideoEditor() {}}}- }, [isPlaying, currentTime, audioRegions, effectiveSpeedRegions]);+ }, [isPlaying, currentTime, audioRegions, speedRegions]);useEffect(() => {if (previewSourceAudioFallbackPaths.length === 0) {@@ -3684,7 +4147,7 @@ export default function VideoEditor() {return;}- const activeSpeedRegion = effectiveSpeedRegions.find(+ const activeSpeedRegion = speedRegions.find((region) => currentTime * 1000 >= region.startMs && currentTime * 1000 < region.endMs,);const targetPlaybackRate = activeSpeedRegion ? activeSpeedRegion.speed : 1;@@ -3738,8 +4201,8 @@ export default function VideoEditor() {isPlaying,previewSourceAudioFallbackPaths,sourceAudioFallbackStartDelayMsByPath,- effectiveSpeedRegions,- ]);+ speedRegions,+ ]);const showExportSuccessToast = useCallback((filePath: string) => {toast.success(`Exported successfully to ${filePath}`, {@@ -4798,6 +5261,111 @@ export default function VideoEditor() {className="flex items-center gap-2 justify-self-end pr-3"style={{ WebkitAppRegion: "no-drag" } as React.CSSProperties}>+ <Popover open={presetPopoverOpen} onOpenChange={setPresetPopoverOpen}>+ <PopoverTrigger asChild>+ <button+ type="button"+ title={t("editor.presets.open", "Open presets")}+ aria-label={t("editor.presets.open", "Open presets")}+ className="inline-flex items-center gap-1.5 bg-transparent p-0 text-sm font-medium tracking-tight text-foreground outline-none transition-opacity hover:opacity-80"+ >+ <span className="flex items-center gap-1.5">+ <BookmarkSimple weight="fill" className="h-4 w-4" />+ <span>{currentEditorPreset?.name ?? t("editor.presets.label", "Presets")}</span>+ </span>+ <ChevronDown className="h-3.5 w-3.5 text-foreground" />+ </button>+ </PopoverTrigger>+ <PopoverContent+ align="end"+ sideOffset={10}+ className="w-[300px] rounded-2xl border border-foreground/10 bg-editor-surface-alt p-3 shadow-xl"+ >+ <div className="space-y-3">+ <form+ onSubmit={(event) => {+ event.preventDefault();+ handleSavePresetSubmit();+ }}+ className="space-y-2"+ >+ <p className="text-[11px] font-medium text-foreground">+ {t("editor.presets.saveCurrentAs", "Save current preset as")}+ </p>+ <div className="flex items-center gap-2">+ <Input+ value={presetNameDraft}+ onChange={(event) => setPresetNameDraft(event.target.value)}+ className="h-9 rounded-xl border-foreground/10 bg-background/70 text-sm"+ placeholder={t("editor.presets.namePlaceholder", "Preset name")}+ aria-label={t("editor.presets.namePlaceholder", "Preset name")}+ />+ <Button+ type="submit"+ size="sm"+ className="h-9 rounded-xl bg-[#2563EB] px-3 text-white hover:bg-[#1d4ed8]"+ >+ {t("common.actions.save", "Save")}+ </Button>+ </div>+ </form>++ <div className="space-y-2">+ <p className="text-[11px] font-medium text-foreground">+ {t("editor.presets.savedList", "Saved presets")}+ </p>+ <div className="max-h-56 space-y-1 overflow-y-auto pr-1 custom-scrollbar">+ {editorPresets.length === 0 ? (+ <div className="rounded-xl border border-dashed border-foreground/10 px-3 py-4 text-center text-[11px] text-muted-foreground">+ {t("editor.presets.empty", "No presets yet.")}+ </div>+ ) : (+ editorPresets.map((preset) => {+ const isActive = preset.id === currentEditorPreset?.id;+ return (+ <div+ key={preset.id}+ className={cn(+ "flex items-center gap-2 rounded-xl border px-2 py-2 text-sm transition-colors",+ isActive+ ? "border-[#2563EB]/20 bg-[#2563EB]/10 text-foreground"+ : "border-foreground/8 bg-foreground/[0.03] text-muted-foreground hover:bg-foreground/[0.06] hover:text-foreground",+ )}+ >+ <button+ type="button"+ onClick={() => handleApplyEditorPreset(preset.id)}+ className="flex min-w-0 flex-1 items-center justify-between text-left"+ >+ <span className="truncate pr-3">{preset.name}</span>+ {isActive ? <Check className="h-3.5 w-3.5 shrink-0 text-[#2563EB]" /> : null}+ </button>+ <button+ type="button"+ onClick={() => handleDeleteEditorPreset(preset.id)}+ className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-lg text-muted-foreground transition-colors hover:bg-foreground/8 hover:text-foreground"+ aria-label={t(+ "editor.presets.deleteAriaLabel",+ "Delete preset {{name}}",+ { name: preset.name },+ )}+ title={t(+ "editor.presets.deleteAriaLabel",+ "Delete preset {{name}}",+ { name: preset.name },+ )}+ >+ <X className="h-3.5 w-3.5" />+ </button>+ </div>+ );+ })+ )}+ </div>+ </div>+ </div>+ </PopoverContent>+ </Popover><DropdownMenuopen={showExportDropdown}onOpenChange={setShowExportDropdown}@@ -4807,7 +5375,7 @@ export default function VideoEditor() {<Buttontype="button"onClick={handleOpenExportDropdown}- className="inline-flex h-8 min-w-[112px] items-center justify-center gap-2 rounded-[5px] bg-[#2563EB] px-4.5 text-white transition-colors hover:bg-[#2563EB]/92"+ className="ml-3 inline-flex h-8 min-w-[112px] items-center justify-center gap-2 rounded-[5px] bg-[#2563EB] px-4.5 text-white transition-colors hover:bg-[#2563EB]/92"><Download className="h-4 w-4" /><span className="text-sm font-semibold tracking-tight">@@ -5107,6 +5675,8 @@ export default function VideoEditor() {selectedZoomId && handleZoomModeChange(mode)}onZoomDelete={handleZoomDelete}+ selectedTrimId={selectedTrimId}+ onTrimDelete={handleTrimDelete}selectedClipId={selectedClipId}selectedClipSpeed={selectedClipId@@ -5140,6 +5710,8 @@ export default function VideoEditor() {onShadowChange={setShadowIntensity}backgroundBlur={backgroundBlur}onBackgroundBlurChange={setBackgroundBlur}+ zoomMotionBlur={zoomMotionBlur}+ onZoomMotionBlurChange={setZoomMotionBlur}autoApplyFreshRecordingAutoZooms={autoApplyFreshRecordingAutoZooms}onAutoApplyFreshRecordingAutoZoomsChange={setAutoApplyFreshRecordingAutoZooms@@ -5172,6 +5744,8 @@ export default function VideoEditor() {onCursorSizeChange={setCursorSize}cursorSmoothing={cursorSmoothing}onCursorSmoothingChange={setCursorSmoothing}+ zoomSmoothness={zoomSmoothness}+ onZoomSmoothnessChange={setZoomSmoothness}zoomClassicMode={zoomClassicMode}onZoomClassicModeChange={setZoomClassicMode}cursorMotionBlur={cursorMotionBlur}@@ -5221,6 +5795,15 @@ export default function VideoEditor() {}onAnnotationBlurColorChange={handleAnnotationBlurColorChange}onAnnotationDelete={handleAnnotationDelete}+ selectedSpeedId={selectedSpeedId}+ selectedSpeedValue={+ selectedSpeedId+ ? (speedRegions.find((r) => r.id === selectedSpeedId)+ ?.speed ?? null)+ : null+ }+ onSpeedChange={handleSpeedChange}+ onSpeedDelete={handleSpeedDelete}/>)}</div>@@ -5331,6 +5914,7 @@ export default function VideoEditor() {showShadow={shadowIntensity > 0}shadowIntensity={shadowIntensity}backgroundBlur={backgroundBlur}+ zoomMotionBlur={zoomMotionBlur}connectZooms={connectZooms}zoomInDurationMs={zoomInDurationMs}zoomInOverlapMs={zoomInOverlapMs}@@ -5355,6 +5939,7 @@ export default function VideoEditor() {annotationRegions={annotationRegions}autoCaptions={autoCaptions}autoCaptionSettings={autoCaptionSettings}+ onEditAutoCaption={handleSaveAutoCaptionEdit}selectedAnnotationId={selectedAnnotationId}onSelectAnnotation={handleSelectAnnotation}onAnnotationPositionChange={@@ -5627,11 +6212,22 @@ export default function VideoEditor() {selectedZoomId={selectedZoomId}onSelectZoom={handleSelectZoom}trimRegions={trimRegions}+ onTrimAdded={handleTrimAdded}+ onTrimSpanChange={handleTrimSpanChange}+ onTrimDelete={handleTrimDelete}+ selectedTrimId={selectedTrimId}+ onSelectTrim={handleSelectTrim}clipRegions={clipRegions}onClipSplit={handleClipSplit}onClipSpanChange={handleClipSpanChange}selectedClipId={selectedClipId}onSelectClip={handleSelectClip}+ speedRegions={speedRegions}+ onSpeedAdded={handleSpeedAdded}+ onSpeedSpanChange={handleSpeedSpanChange}+ onSpeedDelete={handleSpeedDelete}+ selectedSpeedId={selectedSpeedId}+ onSelectSpeed={handleSelectSpeed}audioRegions={audioRegions}onAudioAdded={handleAudioAdded}onAudioSpanChange={handleAudioSpanChange}diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsxindex 11002c6a..99362abb 100644--- a/src/components/video-editor/VideoPlayback.tsx+++ b/src/components/video-editor/VideoPlayback.tsx@@ -1,6 +1,13 @@-import { Application, Container, Graphics, Rectangle, Sprite, Texture, VideoSource } from "pixi.js";+import {+ Application,+ BlurFilter,+ Container,+ Graphics,+ Sprite,+ Texture,+ VideoSource,+} from "pixi.js";import { MotionBlurFilter } from "pixi-filters/motion-blur";-import { ZoomBlurFilter } from "pixi-filters/zoom-blur";import type React from "react";import {forwardRef,@@ -11,6 +18,7 @@ import {useRef,useState,} from "react";+import { useI18n } from "@/contexts/I18nContext";import { getAssetPath, getRenderableAssetUrl, getRenderableVideoUrl } from "@/lib/assetPath";import { clampMediaTimeToDuration, getMediaSyncPlaybackRate } from "@/lib/mediaTiming";import {@@ -18,6 +26,7 @@ import {DEFAULT_WALLPAPER_RELATIVE_PATH,isVideoWallpaperSource,} from "@/lib/wallpapers";+import { type CaptionEditTarget, normalizeCaptionEditText } from "./captionEditing";import { buildActiveCaptionLayout } from "./captionLayout";import {CAPTION_FONT_WEIGHT,@@ -225,6 +234,7 @@ interface VideoPlaybackProps {showShadow?: boolean;shadowIntensity?: number;backgroundBlur?: number;+ zoomMotionBlur?: number;connectZooms?: boolean;zoomInDurationMs?: number;zoomInOverlapMs?: number;@@ -246,6 +256,7 @@ interface VideoPlaybackProps {annotationRegions?: AnnotationRegion[];autoCaptions?: CaptionCue[];autoCaptionSettings?: AutoCaptionSettings;+ onEditAutoCaption?: (target: CaptionEditTarget, text: string) => void;selectedAnnotationId?: string | null;onSelectAnnotation?: (id: string | null) => void;onAnnotationPositionChange?: (id: string, position: { x: number; y: number }) => void;@@ -255,9 +266,6 @@ interface VideoPlaybackProps {cursorStyle?: CursorStyle;cursorSize?: number;cursorSmoothing?: number;- cursorSpringStiffnessMultiplier?: number;- cursorSpringDampingMultiplier?: number;- cursorSpringMassMultiplier?: number;zoomSmoothness?: number;zoomClassicMode?: boolean;cursorMotionBlur?: number;@@ -267,6 +275,11 @@ interface VideoPlaybackProps {volume?: number;}+type CaptionEditSession = {+ target: CaptionEditTarget;+ draft: string;+};+export interface VideoPlaybackRef {video: HTMLVideoElement | null;app: Application | null;@@ -297,6 +310,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(showShadow,shadowIntensity = 0,backgroundBlur = 0,+ zoomMotionBlur = 0,connectZooms = true,zoomInDurationMs = DEFAULT_ZOOM_IN_DURATION_MS,zoomInOverlapMs = DEFAULT_ZOOM_IN_OVERLAP_MS,@@ -318,6 +332,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(annotationRegions = [],autoCaptions = [],autoCaptionSettings,+ onEditAutoCaption,selectedAnnotationId,onSelectAnnotation,onAnnotationPositionChange,@@ -327,9 +342,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(cursorStyle = "tahoe",cursorSize = DEFAULT_CURSOR_SIZE,cursorSmoothing = DEFAULT_CURSOR_SMOOTHING,- cursorSpringStiffnessMultiplier = 1,- cursorSpringDampingMultiplier = 1,- cursorSpringMassMultiplier = 1,zoomSmoothness = 0.5,zoomClassicMode = false,cursorMotionBlur = DEFAULT_CURSOR_MOTION_BLUR,@@ -340,15 +352,14 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(},ref,) => {+ const { t } = useI18n();+ const editCurrentCaptionLabel = t("settings.captions.editCurrent", "Edit current caption");const videoRef = useRef<HTMLVideoElement | null>(null);const containerRef = useRef<HTMLDivElement | null>(null);const appRef = useRef<Application | null>(null);const videoSpriteRef = useRef<Sprite | null>(null);- const videoEffectsContainerRef = useRef<Container | null>(null);const videoContainerRef = useRef<Container | null>(null);const cursorContainerRef = useRef<Container | null>(null);- const zoomBlurFilterRef = useRef<ZoomBlurFilter | null>(null);- const motionBlurFilterRef = useRef<MotionBlurFilter | null>(null);const cameraContainerRef = useRef<Container | null>(null);const timeUpdateAnimationRef = useRef<number | null>(null);const [pixiReady, setPixiReady] = useState(false);@@ -359,10 +370,17 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(const webcamBubbleRef = useRef<HTMLDivElement | null>(null);const webcamBubbleInnerRef = useRef<HTMLDivElement | null>(null);const captionBoxRef = useRef<HTMLDivElement | null>(null);+ const captionEditInputRef = useRef<HTMLTextAreaElement | null>(null);+ const captionEditSessionRef = useRef<CaptionEditSession | null>(null);+ const [captionEditSession, setCaptionEditSession] = useState<CaptionEditSession | null>(+ null,+ );const currentTimeRef = useRef(0);const zoomRegionsRef = useRef<ZoomRegion[]>([]);const selectedZoomIdRef = useRef<string | null>(null);const animationStateRef = useRef<PlaybackAnimationState>(createPlaybackAnimationState());+ const blurFilterRef = useRef<BlurFilter | null>(null);+ const motionBlurFilterRef = useRef<MotionBlurFilter | null>(null);const isDraggingFocusRef = useRef(false);const stageSizeRef = useRef({ width: 0, height: 0 });const videoSizeRef = useRef({ width: 0, height: 0 });@@ -398,6 +416,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(const lastWebcamSyncTimeRef = useRef<number | null>(null);const lastBackgroundSyncTimeRef = useRef<number | null>(null);const bgVideoRef = useRef<HTMLVideoElement | null>(null);+ const zoomMotionBlurRef = useRef(zoomMotionBlur);const connectZoomsRef = useRef(connectZooms);const zoomInDurationMsRef = useRef(zoomInDurationMs);const zoomInOverlapMsRef = useRef(zoomInOverlapMs);@@ -415,9 +434,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(const cursorSizeRef = useRef(cursorSize);const cursorStyleRef = useRef(cursorStyle);const cursorSmoothingRef = useRef(cursorSmoothing);- const cursorSpringStiffnessMultiplierRef = useRef(cursorSpringStiffnessMultiplier);- const cursorSpringDampingMultiplierRef = useRef(cursorSpringDampingMultiplier);- const cursorSpringMassMultiplierRef = useRef(cursorSpringMassMultiplier);const cursorMotionBlurRef = useRef(cursorMotionBlur);const cursorClickBounceRef = useRef(cursorClickBounce);const cursorClickBounceDurationRef = useRef(cursorClickBounceDuration);@@ -471,6 +487,148 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(measureText: (text) => measurementContext.measureText(text).width,});}, [autoCaptionSettings, autoCaptions, currentTime]);+ const activeCaptionEditTarget = activeCaptionLayout?.editTarget ?? null;+ const activeCaptionEditTargetId = activeCaptionEditTarget?.id ?? null;+ const isCaptionEditing = captionEditSession !== null;+ const captionEditDraft = captionEditSession?.draft ?? "";+ const captionEditTargetId = captionEditSession?.target.id ?? null;+ const captionEditTextMetrics = useMemo(() => {+ if (!captionEditSession || !autoCaptionSettings || typeof document === "undefined") {+ return null;+ }++ const overlayWidth = overlayRef.current?.clientWidth || 960;+ const fontSize = getCaptionScaledFontSize(+ autoCaptionSettings.fontSize,+ overlayWidth,+ autoCaptionSettings.maxWidth,+ );+ const maxTextWidthPx = getCaptionTextMaxWidth(+ overlayWidth,+ autoCaptionSettings.maxWidth,+ fontSize,+ );+ const measurementCanvas = document.createElement("canvas");+ const measurementContext = measurementCanvas.getContext("2d");+ if (!measurementContext) {+ return null;+ }++ measurementContext.font = `${CAPTION_FONT_WEIGHT} ${fontSize}px ${getDefaultCaptionFontFamily()}`;+ const measuredWidth = Math.max(+ ...captionEditSession.draft+ .split(/\r?\n/)+ .map((line) => measurementContext.measureText(line || " ").width),+ );++ return {+ fontSize,+ maxTextWidthPx,+ widthPx: Math.ceil(+ Math.min(maxTextWidthPx, Math.max(fontSize * 2, measuredWidth + 2)),+ ),+ };+ }, [autoCaptionSettings, captionEditSession]);+ const captionEditSizeKey = captionEditSession+ ? `${captionEditTextMetrics?.widthPx ?? 0}:${captionEditDraft}`+ : "";++ const beginCaptionEdit = useCallback(() => {+ if (!activeCaptionLayout?.editTarget || !onEditAutoCaption) {+ return;+ }++ videoRef.current?.pause();+ onPlayStateChange(false);+ const nextSession = {+ target: activeCaptionLayout.editTarget,+ draft: activeCaptionLayout.editTarget.text,+ };+ captionEditSessionRef.current = nextSession;+ setCaptionEditSession(nextSession);+ }, [activeCaptionLayout, onEditAutoCaption, onPlayStateChange]);++ const commitCaptionEdit = useCallback(() => {+ const session = captionEditSessionRef.current;+ if (!session || !onEditAutoCaption) {+ captionEditSessionRef.current = null;+ setCaptionEditSession(null);+ return;+ }++ const normalizedDraft = normalizeCaptionEditText(session.draft);+ captionEditSessionRef.current = null;+ if (!normalizedDraft) {+ setCaptionEditSession(null);+ return;+ }++ if (normalizedDraft !== normalizeCaptionEditText(session.target.text)) {+ onEditAutoCaption(session.target, session.draft);+ }+ setCaptionEditSession(null);+ }, [onEditAutoCaption]);++ const cancelCaptionEdit = useCallback(() => {+ captionEditSessionRef.current = null;+ setCaptionEditSession(null);+ }, []);++ useEffect(() => {+ if (!activeCaptionEditTarget) {+ return;+ }++ setCaptionEditSession((session) => {+ if (!session || session.target.id === activeCaptionEditTargetId) {+ return session;+ }++ const nextSession = {+ ...session,+ target: activeCaptionEditTarget,+ };+ captionEditSessionRef.current = nextSession;+ return nextSession;+ });+ }, [activeCaptionEditTarget, activeCaptionEditTargetId]);++ useEffect(() => {+ if (!captionEditTargetId) {+ return;+ }++ const frame = requestAnimationFrame(() => {+ const input = captionEditInputRef.current;+ if (!input) {+ return;+ }++ input.focus();+ const cursorPosition = input.value.length;+ input.setSelectionRange(cursorPosition, cursorPosition);+ });++ return () => cancelAnimationFrame(frame);+ }, [captionEditTargetId]);++ useEffect(() => {+ if (!captionEditSizeKey) {+ return;+ }++ const frame = requestAnimationFrame(() => {+ const input = captionEditInputRef.current;+ if (!input) {+ return;+ }++ input.style.height = "auto";+ input.style.height = `${input.scrollHeight}px`;+ });++ return () => cancelAnimationFrame(frame);+ }, [captionEditSizeKey]);useEffect(() => {const captionBox = captionBoxRef.current;@@ -483,6 +641,12 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(}const frame = requestAnimationFrame(() => {+ if (isCaptionEditing) {+ captionBox.dataset.editingCaption = captionEditSizeKey;+ } else {+ delete captionBox.dataset.editingCaption;+ }+const width = captionBox.offsetWidth;const height = captionBox.offsetHeight;if (width <= 0 || height <= 0) {@@ -507,7 +671,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(});return () => cancelAnimationFrame(frame);- }, [activeCaptionLayout, autoCaptionSettings]);+ }, [activeCaptionLayout, autoCaptionSettings, captionEditSizeKey, isCaptionEditing]);const motionBlurStateRef = useRef<MotionBlurState>(createMotionBlurState());const applyWebcamBubbleLayout = useCallback(@@ -599,28 +763,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>([],);- const syncPreviewMotionBlurQuality = useCallback(() => {- const app = appRef.current;- const videoEffectsContainer = videoEffectsContainerRef.current;- const zoomBlurFilter = zoomBlurFilterRef.current;- const motionBlurFilter = motionBlurFilterRef.current;-- if (!app || !videoEffectsContainer || !zoomBlurFilter || !motionBlurFilter) {- return;- }-- const filterResolution = Math.max(- 1,- app.renderer.resolution || window.devicePixelRatio || 1,- );- const stageWidth = Math.max(1, stageSizeRef.current.width || app.screen.width);- const stageHeight = Math.max(1, stageSizeRef.current.height || app.screen.height);-- zoomBlurFilter.resolution = filterResolution;- motionBlurFilter.resolution = filterResolution;- videoEffectsContainer.filterArea = new Rectangle(0, 0, stageWidth, stageHeight);- }, []);-const layoutVideoContent = useCallback(() => {const container = containerRef.current;const app = appRef.current;@@ -678,7 +820,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(if (result) {stageSizeRef.current = result.stageSize;- syncPreviewMotionBlurQuality();videoSizeRef.current = result.videoSize;baseScaleRef.current = result.baseScale;baseOffsetRef.current = result.baseOffset;@@ -762,7 +903,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(showShadow,shadowIntensity,applyWebcamBubbleLayout,- syncPreviewMotionBlurQuality,]);useEffect(() => {@@ -1094,23 +1234,8 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(}, [speedRegions]);useEffect(() => {- const videoEffectsContainer = videoEffectsContainerRef.current;- const zoomBlurFilter = zoomBlurFilterRef.current;- const motionBlurFilter = motionBlurFilterRef.current;-- if (!videoEffectsContainer || !zoomBlurFilter || !motionBlurFilter) {- return;- }-- videoEffectsContainer.filters = null;- motionBlurFilter.velocity = { x: 0, y: 0 };- motionBlurFilter.kernelSize = 5;- motionBlurFilter.offset = 0;- zoomBlurFilter.strength = 0;- zoomBlurFilter.innerRadius = 0;- zoomBlurFilter.radius = -1;- motionBlurStateRef.current = createMotionBlurState();- }, [pixiReady]);+ zoomMotionBlurRef.current = zoomMotionBlur;+ }, [zoomMotionBlur]);useEffect(() => {connectZoomsRef.current = connectZooms;@@ -1178,18 +1303,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(cursorSmoothingRef.current = cursorSmoothing;}, [cursorSmoothing]);- useEffect(() => {- cursorSpringStiffnessMultiplierRef.current = cursorSpringStiffnessMultiplier;- }, [cursorSpringStiffnessMultiplier]);-- useEffect(() => {- cursorSpringDampingMultiplierRef.current = cursorSpringDampingMultiplier;- }, [cursorSpringDampingMultiplier]);-- useEffect(() => {- cursorSpringMassMultiplierRef.current = cursorSpringMassMultiplier;- }, [cursorSpringMassMultiplier]);-useEffect(() => {zoomSmoothnessRef.current = zoomSmoothness;}, [zoomSmoothness]);@@ -1248,6 +1361,10 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(cursorOverlayRef.current?.reset();motionBlurStateRef.current = createMotionBlurState();+ if (blurFilterRef.current) {+ blurFilterRef.current.blur = 0;+ }+requestAnimationFrame(() => {const container = cameraContainerRef.current;const videoStage = videoContainerRef.current;@@ -1268,8 +1385,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(applyZoomTransform({cameraContainer: container,- zoomBlurFilter: zoomBlurFilterRef.current,- motionBlurFilter: motionBlurFilterRef.current,+ blurFilter: blurFilterRef.current,stageSize: stageSizeRef.current,baseMask: baseMaskRef.current,zoomScale: 1,@@ -1277,8 +1393,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(focusY: DEFAULT_FOCUS.cy,motionIntensity: 0,isPlaying: false,- motionBlurAmount: 0,- motionBlurState: motionBlurStateRef.current,+ motionBlurAmount: zoomMotionBlurRef.current,});requestAnimationFrame(() => {@@ -1437,19 +1552,10 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(cameraContainerRef.current = cameraContainer;app.stage.addChild(cameraContainer);- // Match the export scene graph so zoom motion blur is applied to the- // same layer in preview and export.- const videoEffectsContainer = new Container();- videoEffectsContainerRef.current = videoEffectsContainer;- zoomBlurFilterRef.current = new ZoomBlurFilter({ strength: 0 });- motionBlurFilterRef.current = new MotionBlurFilter([0, 0], 5, 0);- cameraContainer.addChild(videoEffectsContainer);- syncPreviewMotionBlurQuality();-// Video container - holds the masked video spriteconst videoContainer = new Container();videoContainerRef.current = videoContainer;- videoEffectsContainer.addChild(videoContainer);+ cameraContainer.addChild(videoContainer);// Device frame overlay container — sits above video but below cursorconst frameContainer = new Container();@@ -1467,11 +1573,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(dotRadius: DEFAULT_CURSOR_CONFIG.dotRadius * cursorSizeRef.current,style: cursorStyleRef.current,smoothingFactor: cursorSmoothingRef.current,- springTuning: {- stiffnessMultiplier: cursorSpringStiffnessMultiplierRef.current,- dampingMultiplier: cursorSpringDampingMultiplierRef.current,- massMultiplier: cursorSpringMassMultiplierRef.current,- },motionBlur: cursorMotionBlurRef.current,clickBounce: cursorClickBounceRef.current,clickBounceDuration: cursorClickBounceDurationRef.current,@@ -1500,10 +1601,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(cursorOverlayRef.current.destroy();cursorOverlayRef.current = null;}- zoomBlurFilterRef.current?.destroy();- motionBlurFilterRef.current?.destroy();- zoomBlurFilterRef.current = null;- motionBlurFilterRef.current = null;if (app && app.renderer) {app.destroy(true, {children: true,@@ -1513,7 +1610,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(}appRef.current = null;cameraContainerRef.current = null;- videoEffectsContainerRef.current = null;videoContainerRef.current = null;frameContainerRef.current = null;frameSpriteRef.current = null;@@ -1545,12 +1641,10 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(const video = videoRef.current;const app = appRef.current;- const videoEffectsContainer = videoEffectsContainerRef.current;const videoContainer = videoContainerRef.current;const cursorContainer = cursorContainerRef.current;- if (!video || !app || !videoEffectsContainer || !videoContainer || !cursorContainer)- return;+ if (!video || !app || !videoContainer || !cursorContainer) return;if (video.videoWidth === 0 || video.videoHeight === 0) return;const source = VideoSource.from(video);@@ -1576,6 +1670,19 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(animationStateRef.current = createPlaybackAnimationState();+ const blurFilter = new BlurFilter();+ blurFilter.quality = 3;+ blurFilter.resolution = app.renderer.resolution;+ blurFilter.blur = 0;+ const motionBlurFilter = new MotionBlurFilter([0, 0], 5, 0);+ // Don't attach filters by default — the filter pipeline forces the video+ // through an intermediate RenderTexture at renderer resolution, downsampling+ // the native video and destroying detail. Filters are attached conditionally+ // in the ticker only when zoom motion blur is actually active.+ videoContainer.filters = null;+ blurFilterRef.current = blurFilter;+ motionBlurFilterRef.current = motionBlurFilter;+layoutVideoContent();video.pause();@@ -1617,7 +1724,15 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(}videoContainer.mask = null;maskGraphicsRef.current = null;- videoEffectsContainer.filters = null;+ if (blurFilterRef.current) {+ videoContainer.filters = [];+ blurFilterRef.current.destroy();+ blurFilterRef.current = null;+ }+ if (motionBlurFilterRef.current) {+ motionBlurFilterRef.current.destroy();+ motionBlurFilterRef.current = null;+ }videoTexture.destroy(false);videoSpriteRef.current = null;@@ -1629,9 +1744,8 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(const app = appRef.current;const videoSprite = videoSpriteRef.current;- const videoEffectsContainer = videoEffectsContainerRef.current;const videoContainer = videoContainerRef.current;- if (!app || !videoSprite || !videoEffectsContainer || !videoContainer) return;+ if (!app || !videoSprite || !videoContainer) return;const applyTransform = (transform: { scale: number; x: number; y: number },@@ -1646,7 +1760,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(const appliedTransform = applyZoomTransform({cameraContainer,- zoomBlurFilter: zoomBlurFilterRef.current,+ blurFilter: blurFilterRef.current,motionBlurFilter: motionBlurFilterRef.current,stageSize: stageSizeRef.current,baseMask: baseMaskRef.current,@@ -1657,7 +1771,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(motionIntensity,motionVector,isPlaying: isPlayingRef.current,- motionBlurAmount: 0,+ motionBlurAmount: zoomMotionBlurRef.current,transformOverride: transform,motionBlurState: motionBlurStateRef.current,frameTimeMs: performance.now(),@@ -1674,8 +1788,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(currentTimeRef.current,{connectZooms: connectZoomsRef.current,- zoomInDurationMs: zoomInDurationMsRef.current,- zoomOutDurationMs: zoomOutDurationMsRef.current,},);@@ -1845,6 +1957,24 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(motionVector,);+ // Conditionally attach motion blur filter only when the camera is+ // actually moving. When filters are attached, PixiJS routes the video+ // through an intermediate RenderTexture at renderer resolution, which+ // downsamples the native video and degrades preview quality.+ // Hysteresis prevents flickering when motionIntensity oscillates near threshold.+ const filtersActive =+ Array.isArray(videoContainer.filters) && videoContainer.filters.length > 0;+ const cameraIsMoving = filtersActive+ ? motionIntensity > 0.002+ : motionIntensity > 0.008;+ const needsFilters =+ zoomMotionBlurRef.current > 0 && isPlayingRef.current && cameraIsMoving;+ if (needsFilters && !filtersActive && motionBlurFilterRef.current) {+ videoContainer.filters = [motionBlurFilterRef.current];+ } else if (!needsFilters && filtersActive) {+ videoContainer.filters = null;+ }+applyWebcamBubbleLayout(animationStateRef.current.appliedScale || 1);const timeMs = currentTimeRef.current;@@ -2057,11 +2187,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(overlay.setDotRadius(DEFAULT_CURSOR_CONFIG.dotRadius * cursorSize);overlay.setSmoothingFactor(cursorSmoothing);- overlay.setSpringTuning({- stiffnessMultiplier: cursorSpringStiffnessMultiplier,- dampingMultiplier: cursorSpringDampingMultiplier,- massMultiplier: cursorSpringMassMultiplier,- });overlay.setMotionBlur(cursorMotionBlur);overlay.setClickBounce(cursorClickBounce);overlay.setClickBounceDuration(cursorClickBounceDuration);@@ -2090,9 +2215,6 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(cursorStyle,cursorSize,cursorSmoothing,- cursorSpringStiffnessMultiplier,- cursorSpringDampingMultiplier,- cursorSpringMassMultiplier,cursorMotionBlur,cursorClickBounce,cursorClickBounceDuration,@@ -2411,7 +2533,34 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(}}><div+ role={+ onEditAutoCaption && !captionEditSession+ ? "button"+ : undefined+ }+ tabIndex={+ onEditAutoCaption && !captionEditSession ? 0 : undefined+ }+ aria-label={+ onEditAutoCaption && !captionEditSession+ ? editCurrentCaptionLabel+ : undefined+ }ref={captionBoxRef}+ onClick={() => {+ if (!captionEditSession) {+ beginCaptionEdit();+ }+ }}+ onKeyDown={(event) => {+ if (!onEditAutoCaption || captionEditSession) {+ return;+ }+ if (event.key === "Enter" || event.key === " ") {+ event.preventDefault();+ beginCaptionEdit();+ }+ }}style={{backgroundColor: `rgba(0, 0, 0, ${autoCaptionSettings.backgroundOpacity})`,fontFamily: getDefaultCaptionFontFamily(),@@ -2449,42 +2598,137 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(),)}px`,boxSizing: "border-box",+ cursor:+ onEditAutoCaption && !captionEditSession+ ? "text"+ : undefined,+ pointerEvents: onEditAutoCaption ? "auto" : undefined,}}>- {activeCaptionLayout.visibleLines.map((line) => (- <div- key={`${activeCaptionLayout.blockKey}-${line.startWordIndex}`}+ {captionEditSession ? (+ <textarea+ ref={captionEditInputRef}+ value={captionEditSession.draft}+ onChange={(event) => {+ const draft = event.target.value;+ setCaptionEditSession((session) => {+ const nextSession = session+ ? {+ ...session,+ draft,+ }+ : session;+ captionEditSessionRef.current = nextSession;+ return nextSession;+ });+ }}+ onBlur={commitCaptionEdit}+ onClick={(event) => event.stopPropagation()}+ onKeyDown={(event) => {+ if (event.key === "Escape") {+ event.preventDefault();+ cancelCaptionEdit();+ return;+ }+ if (event.key === "Enter" && !event.shiftKey) {+ event.preventDefault();+ event.currentTarget.blur();+ }+ }}+ rows={Math.max(+ 1,+ activeCaptionLayout.visibleLines.length,+ )}+ aria-label={editCurrentCaptionLabel}style={{- display: "flex",- justifyContent: "center",- flexWrap: "nowrap",- whiteSpace: "nowrap",+ display: "block",+ width: `${+ captionEditTextMetrics?.widthPx ??+ Math.max(+ 48,+ activeCaptionLayout.visibleLines.reduce(+ (width, line) =>+ Math.max(width, line.width),+ 0,+ ),+ )+ }px`,+ maxWidth: `${+ captionEditTextMetrics?.maxTextWidthPx ??+ getCaptionTextMaxWidth(+ overlayRef.current?.clientWidth || 960,+ autoCaptionSettings.maxWidth,+ getCaptionScaledFontSize(+ autoCaptionSettings.fontSize,+ overlayRef.current?.clientWidth ||+ 960,+ autoCaptionSettings.maxWidth,+ ),+ )+ }px`,+ minHeight: `${+ Math.max(+ 1,+ activeCaptionLayout.visibleLines.length,+ ) *+ getCaptionScaledFontSize(+ autoCaptionSettings.fontSize,+ overlayRef.current?.clientWidth || 960,+ autoCaptionSettings.maxWidth,+ ) *+ CAPTION_LINE_HEIGHT+ }px`,+ resize: "none",+ border: "0",+ outline: "0",+ padding: "0",+ margin: "0",+ overflow: "hidden",+ background: "transparent",+ color: autoCaptionSettings.textColor,+ font: "inherit",+ fontWeight: "inherit",+ lineHeight: "inherit",+ textAlign: "center",}}- >- {line.words.map((word) => {- const visualState = getCaptionWordVisualState(- activeCaptionLayout.hasWordTimings,- word.state,- );-- return (- <span- key={`${activeCaptionLayout.blockKey}-${word.index}`}- style={{- display: "inline-block",- whiteSpace: "pre",- color: visualState.isInactive- ? autoCaptionSettings.inactiveTextColor- : autoCaptionSettings.textColor,- opacity: visualState.opacity,- }}- >- {`${word.leadingSpace ? " " : ""}${word.text}`}- </span>- );- })}- </div>- ))}+ />+ ) : (+ activeCaptionLayout.visibleLines.map((line) => (+ <div+ key={`${activeCaptionLayout.blockKey}-${line.startWordIndex}`}+ style={{+ display: "flex",+ justifyContent: "center",+ flexWrap: "nowrap",+ whiteSpace: "nowrap",+ }}+ >+ {line.words.map((word) => {+ const visualState =+ getCaptionWordVisualState(+ activeCaptionLayout.hasWordTimings,+ word.state,+ );++ return (+ <span+ key={`${activeCaptionLayout.blockKey}-${word.index}`}+ style={{+ display: "inline-block",+ whiteSpace: "pre",+ color: visualState.isInactive+ ? autoCaptionSettings.inactiveTextColor+ : autoCaptionSettings.textColor,+ opacity: visualState.opacity,+ }}+ >+ {`${word.leadingSpace ? " " : ""}${word.text}`}+ </span>+ );+ })}+ </div>+ ))+ )}</div></div></div>diff --git a/src/components/video-editor/cursorMotionPresets.ts b/src/components/video-editor/cursorMotionPresets.tsdeleted file mode 100644index 8e06809b..00000000--- a/src/components/video-editor/cursorMotionPresets.ts+++ /dev/null@@ -1,51 +0,0 @@-import { DEFAULT_ZOOM_IN_DURATION_MS, DEFAULT_ZOOM_OUT_DURATION_MS } from "./types";--export type CursorMotionPresetId = "focused" | "smooth";--export interface CursorMotionPreset {- id: CursorMotionPresetId;- label: string;- zoomSmoothness: number;- zoomInDurationMs: number;- zoomOutDurationMs: number;- cursorSize: number;- cursorSmoothing: number;- cursorSpringStiffnessMultiplier: number;- cursorSpringDampingMultiplier: number;- cursorSpringMassMultiplier: number;- cursorMotionBlur: number;- cursorClickBounce: number;- cursorClickBounceDuration: number;-}--const SHARED_CURSOR_PRESET_VALUES = {- cursorSize: 2.2,- cursorSmoothing: 0.67,- cursorSpringMassMultiplier: 1.29,- cursorMotionBlur: 0.4,- cursorClickBounce: 3.5,- cursorClickBounceDuration: 350,-} as const;--export const CURSOR_MOTION_PRESETS: Record<CursorMotionPresetId, CursorMotionPreset> = {- focused: {- id: "focused",- label: "Focused",- zoomSmoothness: 0.5,- zoomInDurationMs: 100,- zoomOutDurationMs: 100,- ...SHARED_CURSOR_PRESET_VALUES,- cursorSpringStiffnessMultiplier: 1.35,- cursorSpringDampingMultiplier: 0.79,- },- smooth: {- id: "smooth",- label: "Smooth",- zoomSmoothness: 0.5,- zoomInDurationMs: DEFAULT_ZOOM_IN_DURATION_MS,- zoomOutDurationMs: DEFAULT_ZOOM_OUT_DURATION_MS,- ...SHARED_CURSOR_PRESET_VALUES,- cursorSpringStiffnessMultiplier: 0.92,- cursorSpringDampingMultiplier: 1.36,- },-};\ No newline at end of filediff --git a/src/components/video-editor/editorPreferences.ts b/src/components/video-editor/editorPreferences.tsindex 84b2a0c3..0b97dd34 100644--- a/src/components/video-editor/editorPreferences.ts+++ b/src/components/video-editor/editorPreferences.ts@@ -12,9 +12,6 @@ type PersistedEditorControls = Pick<| "shadowIntensity"| "backgroundBlur"| "zoomMotionBlur"- | "zoomTemporalMotionBlur"- | "zoomMotionBlurSampleCount"- | "zoomMotionBlurShutterFraction"| "connectZooms"| "zoomInDurationMs"| "zoomInOverlapMs"@@ -29,9 +26,6 @@ type PersistedEditorControls = Pick<| "cursorStyle"| "cursorSize"| "cursorSmoothing"- | "cursorSpringStiffnessMultiplier"- | "cursorSpringDampingMultiplier"- | "cursorSpringMassMultiplier"| "cursorMotionBlur"| "cursorClickBounce"| "cursorClickBounceDuration"@@ -89,9 +83,6 @@ export const DEFAULT_EDITOR_PREFERENCES: EditorPreferences = {shadowIntensity: DEFAULT_EDITOR_CONTROLS.shadowIntensity,backgroundBlur: DEFAULT_EDITOR_CONTROLS.backgroundBlur,zoomMotionBlur: DEFAULT_EDITOR_CONTROLS.zoomMotionBlur,- zoomTemporalMotionBlur: DEFAULT_EDITOR_CONTROLS.zoomTemporalMotionBlur,- zoomMotionBlurSampleCount: DEFAULT_EDITOR_CONTROLS.zoomMotionBlurSampleCount,- zoomMotionBlurShutterFraction: DEFAULT_EDITOR_CONTROLS.zoomMotionBlurShutterFraction,connectZooms: DEFAULT_EDITOR_CONTROLS.connectZooms,zoomInDurationMs: DEFAULT_EDITOR_CONTROLS.zoomInDurationMs,zoomInOverlapMs: DEFAULT_EDITOR_CONTROLS.zoomInOverlapMs,@@ -106,9 +97,6 @@ export const DEFAULT_EDITOR_PREFERENCES: EditorPreferences = {cursorStyle: DEFAULT_EDITOR_CONTROLS.cursorStyle,cursorSize: DEFAULT_EDITOR_CONTROLS.cursorSize,cursorSmoothing: DEFAULT_EDITOR_CONTROLS.cursorSmoothing,- cursorSpringStiffnessMultiplier: DEFAULT_EDITOR_CONTROLS.cursorSpringStiffnessMultiplier,- cursorSpringDampingMultiplier: DEFAULT_EDITOR_CONTROLS.cursorSpringDampingMultiplier,- cursorSpringMassMultiplier: DEFAULT_EDITOR_CONTROLS.cursorSpringMassMultiplier,cursorMotionBlur: DEFAULT_EDITOR_CONTROLS.cursorMotionBlur,cursorClickBounce: DEFAULT_EDITOR_CONTROLS.cursorClickBounce,cursorClickBounceDuration: DEFAULT_EDITOR_CONTROLS.cursorClickBounceDuration,@@ -176,7 +164,9 @@ function normalizeNullablePath(value: unknown): string | null {function normalizePresetAutoCaptionSettings(value: unknown): PresetAutoCaptionSettings {return normalizeProjectEditor({autoCaptionSettings:- value && typeof value === "object" ? (value as PresetAutoCaptionSettings) : undefined,+ value && typeof value === "object"+ ? (value as PresetAutoCaptionSettings)+ : undefined,}).autoCaptionSettings;}@@ -191,8 +181,7 @@ function normalizeEditorPresetSnapshot(candidate: unknown): EditorPresetSnapshot...normalizeEditorControls(normalizedPreferences, normalizedPreferences),autoCaptionSettings: normalizePresetAutoCaptionSettings(raw.autoCaptionSettings),whisperExecutablePath:- normalizeNullablePath(raw.whisperExecutablePath) ??- normalizedPreferences.whisperExecutablePath,+ normalizeNullablePath(raw.whisperExecutablePath) ?? normalizedPreferences.whisperExecutablePath,whisperModelPath:normalizeNullablePath(raw.whisperModelPath) ?? normalizedPreferences.whisperModelPath,};@@ -228,8 +217,7 @@ function normalizeEditorPreset(candidate: unknown): EditorPreset | null {}const timestamp = new Date().toISOString();- const id =- typeof raw.id === "string" && raw.id.trim().length > 0 ? raw.id : crypto.randomUUID();+ const id = typeof raw.id === "string" && raw.id.trim().length > 0 ? raw.id : crypto.randomUUID();return {id,@@ -240,6 +228,17 @@ function normalizeEditorPreset(candidate: unknown): EditorPreset | null {};}+function normalizeEditorPresets(candidates: unknown): EditorPreset[] {+ if (!Array.isArray(candidates)) {+ return [];+ }++ return candidates+ .map((item) => normalizeEditorPreset(item))+ .filter((preset): preset is EditorPreset => preset !== null)+ .sort((left, right) => right.updatedAt.localeCompare(left.updatedAt));+}+export function serializeEditorPresetSnapshot(snapshot: EditorPresetSnapshot): string {return JSON.stringify(normalizeEditorPresetSnapshot(snapshot));}@@ -253,11 +252,6 @@ function normalizeEditorControls(shadowIntensity: raw.shadowIntensity ?? fallback.shadowIntensity,backgroundBlur: raw.backgroundBlur ?? fallback.backgroundBlur,zoomMotionBlur: raw.zoomMotionBlur ?? fallback.zoomMotionBlur,- zoomTemporalMotionBlur: raw.zoomTemporalMotionBlur ?? fallback.zoomTemporalMotionBlur,- zoomMotionBlurSampleCount:- raw.zoomMotionBlurSampleCount ?? fallback.zoomMotionBlurSampleCount,- zoomMotionBlurShutterFraction:- raw.zoomMotionBlurShutterFraction ?? fallback.zoomMotionBlurShutterFraction,connectZooms: raw.connectZooms ?? fallback.connectZooms,zoomInDurationMs: raw.zoomInDurationMs ?? fallback.zoomInDurationMs,zoomInOverlapMs: raw.zoomInOverlapMs ?? fallback.zoomInOverlapMs,@@ -272,12 +266,6 @@ function normalizeEditorControls(cursorStyle: raw.cursorStyle ?? fallback.cursorStyle,cursorSize: raw.cursorSize ?? fallback.cursorSize,cursorSmoothing: raw.cursorSmoothing ?? fallback.cursorSmoothing,- cursorSpringStiffnessMultiplier:- raw.cursorSpringStiffnessMultiplier ?? fallback.cursorSpringStiffnessMultiplier,- cursorSpringDampingMultiplier:- raw.cursorSpringDampingMultiplier ?? fallback.cursorSpringDampingMultiplier,- cursorSpringMassMultiplier:- raw.cursorSpringMassMultiplier ?? fallback.cursorSpringMassMultiplier,cursorMotionBlur: raw.cursorMotionBlur ?? fallback.cursorMotionBlur,cursorClickBounce: raw.cursorClickBounce ?? fallback.cursorClickBounce,cursorClickBounceDuration:@@ -315,9 +303,6 @@ function normalizeEditorControls(shadowIntensity: normalized.shadowIntensity,backgroundBlur: normalized.backgroundBlur,zoomMotionBlur: normalized.zoomMotionBlur,- zoomTemporalMotionBlur: normalized.zoomTemporalMotionBlur,- zoomMotionBlurSampleCount: normalized.zoomMotionBlurSampleCount,- zoomMotionBlurShutterFraction: normalized.zoomMotionBlurShutterFraction,connectZooms: normalized.connectZooms,zoomInDurationMs: normalized.zoomInDurationMs,zoomInOverlapMs: normalized.zoomInOverlapMs,@@ -332,9 +317,6 @@ function normalizeEditorControls(cursorStyle: normalized.cursorStyle,cursorSize: normalized.cursorSize,cursorSmoothing: normalized.cursorSmoothing,- cursorSpringStiffnessMultiplier: normalized.cursorSpringStiffnessMultiplier,- cursorSpringDampingMultiplier: normalized.cursorSpringDampingMultiplier,- cursorSpringMassMultiplier: normalized.cursorSpringMassMultiplier,cursorMotionBlur: normalized.cursorMotionBlur,cursorClickBounce: normalized.cursorClickBounce,cursorClickBounceDuration: normalized.cursorClickBounceDuration,@@ -429,28 +411,22 @@ export function loadEditorPresets(): EditorPreset[] {return [];}- const parsed = JSON.parse(stored);- if (!Array.isArray(parsed)) {- return [];- }-- return parsed- .map((item) => normalizeEditorPreset(item))- .filter((preset): preset is EditorPreset => preset !== null)- .sort((left, right) => right.updatedAt.localeCompare(left.updatedAt));+ return normalizeEditorPresets(JSON.parse(stored));} catch {return [];}}-export function saveEditorPresets(presets: EditorPreset[]): void {+export function saveEditorPresets(presets: EditorPreset[]): boolean {if (typeof globalThis.localStorage === "undefined") {- return;+ return false;}try {- globalThis.localStorage.setItem(EDITOR_PRESETS_STORAGE_KEY, JSON.stringify(presets));+ const normalized = normalizeEditorPresets(presets);+ globalThis.localStorage.setItem(EDITOR_PRESETS_STORAGE_KEY, JSON.stringify(normalized));+ return true;} catch {- // Ignore storage failures so editor controls still work.+ return false;}}diff --git a/src/components/video-editor/projectPersistence.ts b/src/components/video-editor/projectPersistence.tsindex b9ab1f1c..5ebfa011 100644--- a/src/components/video-editor/projectPersistence.ts+++ b/src/components/video-editor/projectPersistence.ts@@ -9,13 +9,8 @@ import type {GifSizePreset,} from "@/lib/exporter";import { isValidMp4FrameRate } from "@/lib/exporter";-import {- TEMPORAL_MOTION_BLUR_DEFAULT_SAMPLE_COUNT,- TEMPORAL_MOTION_BLUR_DEFAULT_SHUTTER_FRACTION,-} from "@/lib/exporter/temporalMotionBlur";import { DEFAULT_WALLPAPER_PATH } from "@/lib/wallpapers";import { ASPECT_RATIOS, type AspectRatio, isCustomAspectRatio } from "@/utils/aspectRatioUtils";-import { CURSOR_MOTION_PRESETS } from "./cursorMotionPresets";import {type AnnotationRegion,type AudioRegion,@@ -34,6 +29,11 @@ import {DEFAULT_CONNECTED_ZOOM_EASING,DEFAULT_CONNECTED_ZOOM_GAP_MS,DEFAULT_CROP_REGION,+ DEFAULT_CURSOR_CLICK_BOUNCE,+ DEFAULT_CURSOR_CLICK_BOUNCE_DURATION,+ DEFAULT_CURSOR_MOTION_BLUR,+ DEFAULT_CURSOR_SIZE,+ DEFAULT_CURSOR_SMOOTHING,DEFAULT_CURSOR_STYLE,DEFAULT_CURSOR_SWAY,DEFAULT_FIGURE_DATA,@@ -50,10 +50,11 @@ import {DEFAULT_WEBCAM_SIZE,DEFAULT_WEBCAM_TIME_OFFSET_MS,DEFAULT_ZOOM_DEPTH,+ DEFAULT_ZOOM_IN_DURATION_MS,DEFAULT_ZOOM_IN_EASING,DEFAULT_ZOOM_IN_OVERLAP_MS,DEFAULT_ZOOM_MOTION_BLUR,- DEFAULT_ZOOM_SMOOTHNESS,+ DEFAULT_ZOOM_OUT_DURATION_MS,DEFAULT_ZOOM_OUT_EASING,getDefaultCaptionFontFamily,type Padding,@@ -66,16 +67,11 @@ import {export const PROJECT_VERSION = 1;-const DEFAULT_MOTION_PRESET = CURSOR_MOTION_PRESETS.focused;-export interface ProjectEditorState {wallpaper: string;shadowIntensity: number;backgroundBlur: number;zoomMotionBlur: number;- zoomTemporalMotionBlur: number;- zoomMotionBlurSampleCount: number | null;- zoomMotionBlurShutterFraction: number | null;connectZooms: boolean;zoomInDurationMs: number;zoomInOverlapMs: number;@@ -90,9 +86,6 @@ export interface ProjectEditorState {cursorStyle: CursorStyle;cursorSize: number;cursorSmoothing: number;- cursorSpringStiffnessMultiplier: number;- cursorSpringDampingMultiplier: number;- cursorSpringMassMultiplier: number;zoomSmoothness: number;zoomClassicMode: boolean;cursorMotionBlur: number;@@ -311,11 +304,6 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): Pro: legacyMotionBlurEnabled? 0.35: DEFAULT_ZOOM_MOTION_BLUR;- const normalizedZoomTemporalMotionBlur = isFiniteNumber(- (editor as Partial<ProjectEditorState>).zoomTemporalMotionBlur,- )- ? clamp((editor as Partial<ProjectEditorState>).zoomTemporalMotionBlur as number, 0, 2)- : normalizedZoomMotionBlur;const normalizedBackgroundBlur = isFiniteNumber((editor as Partial<ProjectEditorState>).backgroundBlur,)@@ -323,18 +311,15 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): Pro: legacyShowBlur? 2: 0;- const normalizedZoomMotionBlurSampleCount = TEMPORAL_MOTION_BLUR_DEFAULT_SAMPLE_COUNT;- const normalizedZoomMotionBlurShutterFraction =- TEMPORAL_MOTION_BLUR_DEFAULT_SHUTTER_FRACTION;const normalizedZoomInDurationMs = isFiniteNumber(editor.zoomInDurationMs)? clamp(editor.zoomInDurationMs, 60, 4000)- : DEFAULT_MOTION_PRESET.zoomInDurationMs;+ : DEFAULT_ZOOM_IN_DURATION_MS;const normalizedZoomInOverlapMs = isFiniteNumber(editor.zoomInOverlapMs)? clamp(editor.zoomInOverlapMs, 0, normalizedZoomInDurationMs): DEFAULT_ZOOM_IN_OVERLAP_MS;const normalizedZoomOutDurationMs = isFiniteNumber(editor.zoomOutDurationMs)? clamp(editor.zoomOutDurationMs, 60, 4000)- : DEFAULT_MOTION_PRESET.zoomOutDurationMs;+ : DEFAULT_ZOOM_OUT_DURATION_MS;const normalizedConnectedZoomGapMs = isFiniteNumber(editor.connectedZoomGapMs)? clamp(editor.connectedZoomGapMs, 0, 5000): DEFAULT_CONNECTED_ZOOM_GAP_MS;@@ -733,9 +718,6 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): ProshadowIntensity: typeof editor.shadowIntensity === "number" ? editor.shadowIntensity : 0.67,backgroundBlur: normalizedBackgroundBlur,zoomMotionBlur: normalizedZoomMotionBlur,- zoomTemporalMotionBlur: normalizedZoomTemporalMotionBlur,- zoomMotionBlurSampleCount: normalizedZoomMotionBlurSampleCount,- zoomMotionBlurShutterFraction: normalizedZoomMotionBlurShutterFraction,connectZooms: typeof editor.connectZooms === "boolean" ? editor.connectZooms : true,zoomInDurationMs: normalizedZoomInDurationMs,zoomInOverlapMs: normalizedZoomInOverlapMs,@@ -753,28 +735,21 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): ProcursorStyle: normalizedCursorStyle,cursorSize: isFiniteNumber(editor.cursorSize)? clamp(editor.cursorSize, 0.5, 10)- : DEFAULT_MOTION_PRESET.cursorSize,+ : DEFAULT_CURSOR_SIZE,cursorSmoothing: isFiniteNumber(editor.cursorSmoothing)? clamp(editor.cursorSmoothing, 0, 2)- : DEFAULT_MOTION_PRESET.cursorSmoothing,- cursorSpringStiffnessMultiplier: isFiniteNumber(editor.cursorSpringStiffnessMultiplier)- ? clamp(editor.cursorSpringStiffnessMultiplier, 0.25, 3)- : DEFAULT_MOTION_PRESET.cursorSpringStiffnessMultiplier,- cursorSpringDampingMultiplier: isFiniteNumber(editor.cursorSpringDampingMultiplier)- ? clamp(editor.cursorSpringDampingMultiplier, 0.25, 3)- : DEFAULT_MOTION_PRESET.cursorSpringDampingMultiplier,- cursorSpringMassMultiplier: isFiniteNumber(editor.cursorSpringMassMultiplier)- ? clamp(editor.cursorSpringMassMultiplier, 0.25, 3)- : DEFAULT_MOTION_PRESET.cursorSpringMassMultiplier,- zoomSmoothness: DEFAULT_ZOOM_SMOOTHNESS,+ : DEFAULT_CURSOR_SMOOTHING,+ zoomSmoothness: isFiniteNumber(editor.zoomSmoothness)+ ? clamp(editor.zoomSmoothness, 0, 1)+ : 0.5,zoomClassicMode:typeof editor.zoomClassicMode === "boolean" ? editor.zoomClassicMode : false,cursorMotionBlur: isFiniteNumber((editor as Partial<ProjectEditorState>).cursorMotionBlur)? clamp((editor as Partial<ProjectEditorState>).cursorMotionBlur as number, 0, 2)- : DEFAULT_MOTION_PRESET.cursorMotionBlur,+ : DEFAULT_CURSOR_MOTION_BLUR,cursorClickBounce: isFiniteNumber((editor as Partial<ProjectEditorState>).cursorClickBounce)? clamp((editor as Partial<ProjectEditorState>).cursorClickBounce as number, 0, 5)- : DEFAULT_MOTION_PRESET.cursorClickBounce,+ : DEFAULT_CURSOR_CLICK_BOUNCE,cursorClickBounceDuration: isFiniteNumber((editor as Partial<ProjectEditorState>).cursorClickBounceDuration,)@@ -783,7 +758,7 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): Pro60,500,)- : DEFAULT_MOTION_PRESET.cursorClickBounceDuration,+ : DEFAULT_CURSOR_CLICK_BOUNCE_DURATION,cursorSway: isFiniteNumber((editor as Partial<ProjectEditorState>).cursorSway)? clamp((editor as Partial<ProjectEditorState>).cursorSway as number, 0, 2): DEFAULT_CURSOR_SWAY,diff --git a/src/components/video-editor/timeline/TimelineEditor.tsx b/src/components/video-editor/timeline/TimelineEditor.tsxindex 6528c13b..32643bec 100644--- a/src/components/video-editor/timeline/TimelineEditor.tsx+++ b/src/components/video-editor/timeline/TimelineEditor.tsx@@ -1048,11 +1048,11 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(selectedZoomId,onSelectZoom,trimRegions = [],- onTrimAdded: _onTrimAdded,+ onTrimAdded,onTrimSpanChange,- onTrimDelete: _onTrimDelete,- selectedTrimId: _selectedTrimId,- onSelectTrim: _onSelectTrim,+ onTrimDelete,+ selectedTrimId,+ onSelectTrim,clipRegions = [],onClipSplit,onClipSpanChange,@@ -1066,11 +1066,11 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(selectedAnnotationId,onSelectAnnotation,speedRegions = [],- onSpeedAdded: _onSpeedAdded,+ onSpeedAdded,onSpeedSpanChange,- onSpeedDelete: _onSpeedDelete,- selectedSpeedId: _selectedSpeedId,- onSelectSpeed: _onSelectSpeed,+ onSpeedDelete,+ selectedSpeedId,+ onSelectSpeed,audioRegions = [],onAudioAdded,onAudioSpanChange,@@ -1212,6 +1212,13 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(onSelectZoom(null);}, [selectedZoomId, onZoomDelete, onSelectZoom]);+ // Delete selected trim item+ const deleteSelectedTrim = useCallback(() => {+ if (!selectedTrimId || !onTrimDelete || !onSelectTrim) return;+ onTrimDelete(selectedTrimId);+ onSelectTrim(null);+ }, [selectedTrimId, onTrimDelete, onSelectTrim]);+const deleteSelectedClip = useCallback(() => {if (!selectedClipId || !onClipDelete || !onSelectClip) return;onClipDelete(selectedClipId);@@ -1224,6 +1231,12 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(onSelectAnnotation(null);}, [selectedAnnotationId, onAnnotationDelete, onSelectAnnotation]);+ const deleteSelectedSpeed = useCallback(() => {+ if (!selectedSpeedId || !onSpeedDelete || !onSelectSpeed) return;+ onSpeedDelete(selectedSpeedId);+ onSelectSpeed(null);+ }, [selectedSpeedId, onSpeedDelete, onSelectSpeed]);+const deleteSelectedAudio = useCallback(() => {if (!selectedAudioId || !onAudioDelete || !onSelectAudio) return;onAudioDelete(selectedAudioId);@@ -1232,32 +1245,42 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(const clearSelectedBlocks = useCallback(() => {onSelectZoom(null);+ onSelectTrim?.(null);onSelectClip?.(null);onSelectAnnotation?.(null);+ onSelectSpeed?.(null);onSelectAudio?.(null);setSelectAllBlocksActive(false);}, [onSelectAnnotation,onSelectAudio,onSelectClip,+ onSelectSpeed,+ onSelectTrim,onSelectZoom,]);const hasAnyTimelineBlocks =zoomRegions.length > 0 ||+ trimRegions.length > 0 ||clipRegions.length > 0 ||annotationRegions.length > 0 ||+ speedRegions.length > 0 ||audioRegions.length > 0;const deleteAllBlocks = useCallback(() => {const zoomIds = zoomRegions.map((region) => region.id);+ const trimIds = trimRegions.map((region) => region.id);const clipIds = clipRegions.map((region) => region.id);const annotationIds = annotationRegions.map((region) => region.id);+ const speedIds = speedRegions.map((region) => region.id);const audioIds = audioRegions.map((region) => region.id);zoomIds.forEach((id) => onZoomDelete(id));+ trimIds.forEach((id) => onTrimDelete?.(id));clipIds.forEach((id) => onClipDelete?.(id));annotationIds.forEach((id) => onAnnotationDelete?.(id));+ speedIds.forEach((id) => onSpeedDelete?.(id));audioIds.forEach((id) => onAudioDelete?.(id));clearSelectedBlocks();@@ -1270,7 +1293,11 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(onAnnotationDelete,onAudioDelete,onClipDelete,+ onSpeedDelete,+ onTrimDelete,onZoomDelete,+ speedRegions,+ trimRegions,zoomRegions,]);@@ -1282,6 +1309,14 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>([onSelectZoom],);+ const handleSelectTrim = useCallback(+ (id: string | null) => {+ setSelectAllBlocksActive(false);+ onSelectTrim?.(id);+ },+ [onSelectTrim],+ );+const handleSelectClip = useCallback((id: string | null) => {setSelectAllBlocksActive(false);@@ -1298,6 +1333,14 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>([onSelectAnnotation],);+ const handleSelectSpeed = useCallback(+ (id: string | null) => {+ setSelectAllBlocksActive(false);+ onSelectSpeed?.(id);+ },+ [onSelectSpeed],+ );+const handleSelectAudio = useCallback((id: string | null) => {setSelectAllBlocksActive(false);@@ -1476,26 +1519,17 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(}const startPos = Math.max(0, Math.min(startMs, totalMs));- const activeClip = clipRegions.find(- (clip) => startPos >= clip.startMs && startPos < clip.endMs,- );- if (!activeClip) {- return false;- }-const sorted = [...zoomRegions].sort((a, b) => a.startMs - b.startMs);const nextRegion = sorted.find((region) => region.startMs > startPos);- const gapToNextClipEdge = activeClip.endMs - startPos;- const gapToNextRegion = nextRegion ? nextRegion.startMs - startPos : gapToNextClipEdge;- const availableDuration = Math.min(gapToNextClipEdge, gapToNextRegion);+ const gapToNext = nextRegion ? nextRegion.startMs - startPos : totalMs - startPos;const isOverlapping = sorted.some((region) => startPos >= region.startMs && startPos < region.endMs,);- return !isOverlapping && availableDuration >= defaultDuration;+ return !isOverlapping && gapToNext >= defaultDuration;},- [videoDuration, totalMs, zoomRegions, defaultRegionDurationMs, clipRegions],+ [videoDuration, totalMs, zoomRegions, defaultRegionDurationMs],);const addZoomAtMs = useCallback(@@ -1513,7 +1547,7 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(if (!canPlaceZoomAtMs(startPos)) {toast.error("Cannot place zoom here", {description:- "Place zooms inside a kept clip and leave enough room before the clip ends.",+ "Zoom already exists at this location or not enough space available.",});return;}@@ -1615,6 +1649,46 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(handleSuggestZooms();}, [autoSuggestZoomsTrigger, handleSuggestZooms, onAutoSuggestZoomsConsumed]);+ const handleAddTrim = useCallback(() => {+ if (!videoDuration || videoDuration === 0 || totalMs === 0 || !onTrimAdded) {+ return;+ }++ const defaultDuration = Math.min(defaultRegionDurationMs, totalMs);+ if (defaultDuration <= 0) {+ return;+ }++ // Always place trim at playhead+ const startPos = Math.max(0, Math.min(currentTimeMs, totalMs));+ // Find the next trim region after the playhead+ const sorted = [...trimRegions].sort((a, b) => a.startMs - b.startMs);+ const nextRegion = sorted.find((region) => region.startMs > startPos);+ const gapToNext = nextRegion ? nextRegion.startMs - startPos : totalMs - startPos;++ // Check if playhead is inside any trim region+ const isOverlapping = sorted.some(+ (region) => startPos >= region.startMs && startPos < region.endMs,+ );+ if (isOverlapping || gapToNext <= 0) {+ toast.error("Cannot place trim here", {+ description:+ "Trim already exists at this location or not enough space available.",+ });+ return;+ }++ const actualDuration = Math.min(defaultRegionDurationMs, gapToNext);+ onTrimAdded({ start: startPos, end: startPos + actualDuration });+ }, [+ videoDuration,+ totalMs,+ currentTimeMs,+ trimRegions,+ onTrimAdded,+ defaultRegionDurationMs,+ ]);+const handleSplitClip = useCallback(() => {if (!videoDuration || videoDuration === 0 || totalMs === 0 || !onClipSplit) {return;@@ -1622,6 +1696,46 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(onClipSplit(currentTimeMs);}, [videoDuration, totalMs, currentTimeMs, onClipSplit]);+ const handleAddSpeed = useCallback(() => {+ if (!videoDuration || videoDuration === 0 || totalMs === 0 || !onSpeedAdded) {+ return;+ }++ const defaultDuration = Math.min(defaultRegionDurationMs, totalMs);+ if (defaultDuration <= 0) {+ return;+ }++ // Always place speed region at playhead+ const startPos = Math.max(0, Math.min(currentTimeMs, totalMs));+ // Find the next speed region after the playhead+ const sorted = [...speedRegions].sort((a, b) => a.startMs - b.startMs);+ const nextRegion = sorted.find((region) => region.startMs > startPos);+ const gapToNext = nextRegion ? nextRegion.startMs - startPos : totalMs - startPos;++ // Check if playhead is inside any speed region+ const isOverlapping = sorted.some(+ (region) => startPos >= region.startMs && startPos < region.endMs,+ );+ if (isOverlapping || gapToNext <= 0) {+ toast.error("Cannot place speed here", {+ description:+ "Speed region already exists at this location or not enough space available.",+ });+ return;+ }++ const actualDuration = Math.min(defaultRegionDurationMs, gapToNext);+ onSpeedAdded({ start: startPos, end: startPos + actualDuration });+ }, [+ videoDuration,+ totalMs,+ currentTimeMs,+ speedRegions,+ onSpeedAdded,+ defaultRegionDurationMs,+ ]);+const handleAddAudio = useCallback(async (preferredTrackIndex?: number) => {if (!videoDuration || videoDuration === 0 || totalMs === 0 || !onAudioAdded) {@@ -1804,12 +1918,18 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(if (matchesShortcut(e, keyShortcuts.addZoom, isMac)) {handleAddZoom();}+ if (matchesShortcut(e, keyShortcuts.addTrim, isMac)) {+ handleAddTrim();+ }if (matchesShortcut(e, keyShortcuts.splitClip, isMac)) {handleSplitClip();}if (matchesShortcut(e, keyShortcuts.addAnnotation, isMac)) {handleAddAnnotation();}+ if (matchesShortcut(e, keyShortcuts.addSpeed, isMac)) {+ handleAddSpeed();+ }// Tab: Cycle through overlapping annotations at current timeif (e.key === "Tab" && annotationRegions.length > 0) {@@ -1850,10 +1970,14 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(deleteSelectedKeyframe();} else if (selectedZoomId) {deleteSelectedZoom();+ } else if (selectedTrimId) {+ deleteSelectedTrim();} else if (selectedClipId) {deleteSelectedClip();} else if (selectedAnnotationId) {deleteSelectedAnnotation();+ } else if (selectedSpeedId) {+ deleteSelectedSpeed();} else if (selectedAudioId) {deleteSelectedAudio();}@@ -1864,18 +1988,24 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(}, [addKeyframe,handleAddZoom,+ handleAddTrim,handleSplitClip,handleAddAnnotation,+ handleAddSpeed,deleteAllBlocks,deleteSelectedKeyframe,deleteSelectedZoom,+ deleteSelectedTrim,deleteSelectedClip,deleteSelectedAnnotation,+ deleteSelectedSpeed,deleteSelectedAudio,selectedKeyframeId,selectedZoomId,+ selectedTrimId,selectedClipId,selectedAnnotationId,+ selectedSpeedId,selectedAudioId,annotationRegions,currentTimeMs,@@ -2349,12 +2479,16 @@ const TimelineEditor = forwardRef<TimelineEditorHandle, TimelineEditorProps>(onAddZoomAtMs={addZoomAtMs}canPlaceZoomAtMs={canPlaceZoomAtMs}onSelectZoom={handleSelectZoom}+ onSelectTrim={handleSelectTrim}onSelectClip={handleSelectClip}onSelectAnnotation={handleSelectAnnotation}+ onSelectSpeed={handleSelectSpeed}onSelectAudio={handleSelectAudio}selectedZoomId={selectedZoomId}+ selectedTrimId={selectedTrimId}selectedClipId={selectedClipId}selectedAnnotationId={selectedAnnotationId}+ selectedSpeedId={selectedSpeedId}selectedAudioId={selectedAudioId}selectAllBlocksActive={selectAllBlocksActive}onClearBlockSelection={clearSelectedBlocks}diff --git a/src/components/video-editor/types.test.ts b/src/components/video-editor/types.test.tsindex 12a63cb3..1d4412f1 100644--- a/src/components/video-editor/types.test.ts+++ b/src/components/video-editor/types.test.ts@@ -1,11 +1,6 @@import { describe, expect, it } from "vitest";-import {- extendAutoFullTrackClip,- findClipAtTimelineTime,- mapSourceTimeToTimelineTime,- mapTimelineTimeToSourceTime,-} from "./types";+import { extendAutoFullTrackClip } from "./types";describe("extendAutoFullTrackClip", () => {it("extends the default full-track clip when metadata duration grows", () => {@@ -110,35 +105,3 @@ describe("extendAutoFullTrackClip", () => {).toBeNull();});});--describe("clip timeline mapping", () => {- const clips = [- { id: "clip-1", startMs: 0, endMs: 4_000, speed: 1 },- { id: "clip-2", startMs: 6_000, endMs: 8_000, speed: 2 },- ];-- it("maps kept timeline time into source time", () => {- expect(mapTimelineTimeToSourceTime(1_500, clips)).toBe(1_500);- expect(mapTimelineTimeToSourceTime(7_000, clips)).toBe(8_000);- });-- it("snaps timeline gaps to the nearest clip edge", () => {- expect(mapTimelineTimeToSourceTime(4_300, clips)).toBe(4_000);- expect(mapTimelineTimeToSourceTime(5_700, clips)).toBe(6_000);- });-- it("maps kept source time back into timeline time", () => {- expect(mapSourceTimeToTimelineTime(1_500, clips)).toBe(1_500);- expect(mapSourceTimeToTimelineTime(8_000, clips)).toBe(7_000);- });-- it("snaps removed source gaps to the nearest kept boundary", () => {- expect(mapSourceTimeToTimelineTime(4_200, clips)).toBe(4_000);- expect(mapSourceTimeToTimelineTime(5_900, clips)).toBe(6_000);- });-- it("finds clips only inside visible kept spans", () => {- expect(findClipAtTimelineTime(500, clips)?.id).toBe("clip-1");- expect(findClipAtTimelineTime(5_000, clips)).toBeNull();- });-});diff --git a/src/components/video-editor/types.ts b/src/components/video-editor/types.tsindex efa42d0f..ec29d812 100644--- a/src/components/video-editor/types.ts+++ b/src/components/video-editor/types.ts@@ -100,7 +100,6 @@ export const DEFAULT_CURSOR_MOTION_BLUR = 0.4;export const DEFAULT_CURSOR_CLICK_BOUNCE = 2.5;export const DEFAULT_CURSOR_CLICK_BOUNCE_DURATION = 350;export const DEFAULT_CURSOR_SWAY = 0.25;-export const DEFAULT_ZOOM_SMOOTHNESS = 0.5;export const DEFAULT_ZOOM_MOTION_BLUR = 0.35;export const DEFAULT_ZOOM_IN_DURATION_MS = 1522.575;export const DEFAULT_ZOOM_IN_OVERLAP_MS = 500;@@ -156,92 +155,6 @@ export function getClipSourceEndMs(clip: ClipRegion): number {return Math.round(clip.startMs + displayDurationMs * speed);}-export function sortClipRegions(clips: ClipRegion[]): ClipRegion[] {- return [...clips].sort((left, right) => left.startMs - right.startMs);-}--function getSafeClipSpeed(clip: ClipRegion) {- return Number.isFinite(clip.speed) && clip.speed > 0 ? clip.speed : 1;-}--function clampToNearestClipBoundary(- timeMs: number,- clips: ClipRegion[],- kind: "timeline" | "source",-) {- let nearestTimeMs = Math.round(timeMs);- let nearestDistance = Number.POSITIVE_INFINITY;-- for (const clip of clips) {- const boundaries =- kind === "timeline"- ? [clip.startMs, clip.endMs]- : [clip.startMs, getClipSourceEndMs(clip)];-- for (const boundary of boundaries) {- const distance = Math.abs(timeMs - boundary);- if (distance < nearestDistance) {- nearestDistance = distance;- nearestTimeMs = Math.round(boundary);- }- }- }-- return nearestTimeMs;-}--export function mapTimelineTimeToSourceTime(timeMs: number, clips: ClipRegion[]): number {- const roundedTimeMs = Math.round(timeMs);- const sortedClips = sortClipRegions(clips);-- for (const clip of sortedClips) {- if (roundedTimeMs < clip.startMs || roundedTimeMs > clip.endMs) {- continue;- }-- return Math.round(- clip.startMs + (roundedTimeMs - clip.startMs) * getSafeClipSpeed(clip),- );- }-- if (sortedClips.length === 0) {- return roundedTimeMs;- }-- return clampToNearestClipBoundary(roundedTimeMs, sortedClips, "timeline");-}--export function mapSourceTimeToTimelineTime(timeMs: number, clips: ClipRegion[]): number {- const roundedTimeMs = Math.round(timeMs);- const sortedClips = sortClipRegions(clips);-- for (const clip of sortedClips) {- const sourceEndMs = getClipSourceEndMs(clip);- if (roundedTimeMs < clip.startMs || roundedTimeMs > sourceEndMs) {- continue;- }-- return Math.round(- clip.startMs + (roundedTimeMs - clip.startMs) / getSafeClipSpeed(clip),- );- }-- if (sortedClips.length === 0) {- return roundedTimeMs;- }-- return clampToNearestClipBoundary(roundedTimeMs, sortedClips, "source");-}--export function findClipAtTimelineTime(timeMs: number, clips: ClipRegion[]): ClipRegion | null {- const roundedTimeMs = Math.round(timeMs);- return (- sortClipRegions(clips).find(- (clip) => roundedTimeMs >= clip.startMs && roundedTimeMs < clip.endMs,- ) ?? null- );-}-export function extendAutoFullTrackClip(clips: ClipRegion[],autoClipId: string | null,diff --git a/src/components/video-editor/videoPlayback/cursorFollowCamera.test.ts b/src/components/video-editor/videoPlayback/cursorFollowCamera.test.tsdeleted file mode 100644index 8493623a..00000000--- a/src/components/video-editor/videoPlayback/cursorFollowCamera.test.ts+++ /dev/null@@ -1,110 +0,0 @@-import { describe, expect, it } from "vitest";-import {- computeCursorFollowFocus,- createCursorFollowCameraState,-} from "./cursorFollowCamera";--describe("computeCursorFollowFocus", () => {- it("holds the camera while the cursor stays inside the safe zone", () => {- const state = createCursorFollowCameraState();- const cursorSamples = [- { timeMs: 0, cx: 0.5, cy: 0.5, interactionType: "move" as const },- { timeMs: 100, cx: 0.6, cy: 0.58, interactionType: "move" as const },- ];-- const initialFocus = computeCursorFollowFocus(- state,- cursorSamples,- 0,- 2,- 1,- { cx: 0.5, cy: 0.5 },- { snapToEdgesRatio: 0.25 },- );- const heldFocus = computeCursorFollowFocus(- state,- cursorSamples,- 100,- 2,- 1,- { cx: 0.5, cy: 0.5 },- { snapToEdgesRatio: 0.25 },- );-- expect(initialFocus).toEqual({ cx: 0.5, cy: 0.5 });- expect(heldFocus).toEqual(initialFocus);- });-- it("recenters the cursor after it leaves the safe zone", () => {- const state = createCursorFollowCameraState();- const cursorSamples = [- { timeMs: 0, cx: 0.5, cy: 0.5, interactionType: "move" as const },- { timeMs: 100, cx: 0.7, cy: 0.5, interactionType: "move" as const },- { timeMs: 200, cx: 0.72, cy: 0.5, interactionType: "move" as const },- ];-- computeCursorFollowFocus(- state,- cursorSamples,- 0,- 2,- 1,- { cx: 0.5, cy: 0.5 },- { snapToEdgesRatio: 0.25 },- );-- const firstShift = computeCursorFollowFocus(- state,- cursorSamples,- 100,- 2,- 1,- { cx: 0.5, cy: 0.5 },- { snapToEdgesRatio: 0.25 },- );- const secondShift = computeCursorFollowFocus(- state,- cursorSamples,- 200,- 2,- 1,- { cx: 0.5, cy: 0.5 },- { snapToEdgesRatio: 0.25 },- );-- expect(firstShift.cx).toBeCloseTo(0.7, 6);- expect(firstShift.cy).toBeCloseTo(0.5, 6);- expect(secondShift.cx).toBeCloseTo(0.7, 6);- expect(secondShift.cy).toBeCloseTo(0.5, 6);- });-- it("clamps the camera when the cursor pushes past the stage edge", () => {- const state = createCursorFollowCameraState();- const cursorSamples = [- { timeMs: 0, cx: 0.5, cy: 0.5, interactionType: "move" as const },- { timeMs: 100, cx: 1, cy: 1, interactionType: "move" as const },- ];-- computeCursorFollowFocus(- state,- cursorSamples,- 0,- 2,- 1,- { cx: 0.5, cy: 0.5 },- { snapToEdgesRatio: 0.25 },- );-- const clampedFocus = computeCursorFollowFocus(- state,- cursorSamples,- 100,- 2,- 1,- { cx: 0.5, cy: 0.5 },- { snapToEdgesRatio: 0.25 },- );-- expect(clampedFocus).toEqual({ cx: 0.75, cy: 0.75 });- });-});\ No newline at end of filediff --git a/src/components/video-editor/videoPlayback/cursorFollowCamera.ts b/src/components/video-editor/videoPlayback/cursorFollowCamera.tsindex 75106a81..b18cdec1 100644--- a/src/components/video-editor/videoPlayback/cursorFollowCamera.ts+++ b/src/components/video-editor/videoPlayback/cursorFollowCamera.ts@@ -1,13 +1,16 @@import type { CursorTelemetryPoint, ZoomFocus } from "../types";import { interpolateCursorPosition } from "./cursorRenderer";-import { clampFocusToScale } from "./focusUtils";+import { edgeSnapFocus } from "./focusUtils";/*** Cursor-follow camera.*- * Keeps a persistent camera center while zoomed in. The camera only recenters- * after the cursor leaves an inner safe zone within the current zoomed view,- * shifting just enough to bring the cursor back inside that zone.+ * Computes a TARGET focus point each frame (cursor → edge snap → focus),+ * then the zoom transition animation layer smoothly interpolates toward it.+ *+ * Edge snap: With snapToEdgesRatio = 0.25, cursor positions within 25% of+ * each edge pin the camera to that edge. The middle 50% maps linearly.+ * This prevents the camera from panning beyond the viewport bounds.*//** Default snap ratio for manual zoom regions */@@ -20,10 +23,6 @@ export interface CursorFollowCameraState {initialized: boolean;/** Time of last update in ms (video time, not wall clock) */lastTimeMs: number;- /** Current camera focus while zoomed */- focusX: number;- /** Current camera focus while zoomed */- focusY: number;/** Whether the camera was active (zoomed) on the previous frame */wasZoomed: boolean;/** Whether the zoom reached full strength (≈1) — used to detect zoom-out */@@ -36,7 +35,7 @@ export interface CursorFollowCameraState {export interface CursorFollowConfig {/*** snapToEdgesRatio — how much of the screen edge pins the camera.- * 0.25 for manual zooms, 0.25 for auto/system zooms.+ * 0.25 for manual zooms, 0.5 for auto/system zooms.*/snapToEdgesRatio: number;}@@ -49,8 +48,6 @@ export function createCursorFollowCameraState(): CursorFollowCameraState {return {initialized: false,lastTimeMs: 0,- focusX: 0.5,- focusY: 0.5,wasZoomed: false,reachedFullZoom: false,frozenFocusX: 0.5,@@ -61,71 +58,19 @@ export function createCursorFollowCameraState(): CursorFollowCameraState {export function resetCursorFollowCamera(state: CursorFollowCameraState): void {state.initialized = false;state.lastTimeMs = 0;- state.focusX = 0.5;- state.focusY = 0.5;state.wasZoomed = false;state.reachedFullZoom = false;state.frozenFocusX = 0.5;state.frozenFocusY = 0.5;}-function clampSafeZoneRatio(ratio: number) {- if (!Number.isFinite(ratio)) {- return SNAP_TO_EDGES_RATIO_AUTO;- }-- return Math.max(0, Math.min(0.49, ratio));-}--function getVisibleHalfSpan(zoomScale: number) {- return 1 / (2 * Math.max(1, zoomScale));-}--function recenterFocusWhenCursorLeavesSafeZone(- currentFocus: ZoomFocus,- cursorFocus: ZoomFocus,- zoomScale: number,- safeZoneRatio: number,-): ZoomFocus {- const halfSpan = getVisibleHalfSpan(zoomScale);- const visibleSpan = halfSpan * 2;- const safeZoneInset = visibleSpan * clampSafeZoneRatio(safeZoneRatio);-- const safeLeft = currentFocus.cx - halfSpan + safeZoneInset;- const safeRight = currentFocus.cx + halfSpan - safeZoneInset;- const safeTop = currentFocus.cy - halfSpan + safeZoneInset;- const safeBottom = currentFocus.cy + halfSpan - safeZoneInset;-- let nextFocusX = currentFocus.cx;- let nextFocusY = currentFocus.cy;-- if (cursorFocus.cx < safeLeft) {- nextFocusX = cursorFocus.cx;- } else if (cursorFocus.cx > safeRight) {- nextFocusX = cursorFocus.cx;- }-- if (cursorFocus.cy < safeTop) {- nextFocusY = cursorFocus.cy;- } else if (cursorFocus.cy > safeBottom) {- nextFocusY = cursorFocus.cy;- }-- return clampFocusToScale(- {- cx: nextFocusX,- cy: nextFocusY,- },- zoomScale,- );-}-/*** Cursor follow: target focus computation.*- * Computes the desired camera focus point based on a persistent camera center- * and an inner safe zone. The zoom transition layer handles smooth- * interpolation toward the returned focus.+ * Computes the desired camera focus point based on cursor position and+ * edge snap. The zoom transition layer handles smooth interpolation.+ *+ * Pipeline: cursor → edgeSnap(snapToEdgesRatio) → focus** @returns The target focus point for this frame (normalized 0-1).*/@@ -138,7 +83,11 @@ export function computeCursorFollowFocus(regionFocus: ZoomFocus,config: CursorFollowConfig = DEFAULT_CURSOR_FOLLOW_CONFIG,): ZoomFocus {- const clampedRegionFocus = clampFocusToScale(regionFocus, zoomScale);+ // If no cursor data available, fall back to static region focus+ const cursorPos = interpolateCursorPosition(cursorSamples, timeMs);+ if (!cursorPos) {+ return regionFocus;+ }// If not zoomed (strength ≈ 0), reset state and return region focusif (zoomStrength < 0.01) {@@ -147,14 +96,7 @@ export function computeCursorFollowFocus(state.initialized = false;state.reachedFullZoom = false;}- return clampedRegionFocus;- }-- const cursorPos = interpolateCursorPosition(cursorSamples, timeMs);- if (!cursorPos) {- return state.initialized- ? { cx: state.focusX, cy: state.focusY }- : clampedRegionFocus;+ return regionFocus;}// Track when zoom reaches full strength@@ -167,36 +109,24 @@ export function computeCursorFollowFocus(return { cx: state.frozenFocusX, cy: state.frozenFocusY };}- const timeWentBackwards = state.initialized && timeMs + 0.5 < state.lastTimeMs;-- if (!state.initialized || !state.wasZoomed || timeWentBackwards) {- const initialFocus = recenterFocusWhenCursorLeavesSafeZone(- clampedRegionFocus,- { cx: cursorPos.cx, cy: cursorPos.cy },- zoomScale,- config.snapToEdgesRatio,- );+ // First frame of a zoom: mark initialized+ if (!state.initialized || !state.wasZoomed) {state.lastTimeMs = timeMs;state.initialized = true;state.wasZoomed = true;- state.focusX = initialFocus.cx;- state.focusY = initialFocus.cy;- state.frozenFocusX = initialFocus.cx;- state.frozenFocusY = initialFocus.cy;- return initialFocus;}state.lastTimeMs = timeMs;- const targetFocus = recenterFocusWhenCursorLeavesSafeZone(- { cx: state.focusX, cy: state.focusY },+ // Edge snap: maps cursor through clamped linear remap.+ // Camera pins to edge when cursor is within snapToEdgesRatio of boundary.+ const targetFocus = edgeSnapFocus({ cx: cursorPos.cx, cy: cursorPos.cy },zoomScale,config.snapToEdgesRatio,);- state.focusX = targetFocus.cx;- state.focusY = targetFocus.cy;+ // Save for zoom-out freezestate.frozenFocusX = targetFocus.cx;state.frozenFocusY = targetFocus.cy;diff --git a/src/components/video-editor/videoPlayback/cursorRenderer.ts b/src/components/video-editor/videoPlayback/cursorRenderer.tsindex 641af44d..f34503ad 100644--- a/src/components/video-editor/videoPlayback/cursorRenderer.ts+++ b/src/components/video-editor/videoPlayback/cursorRenderer.ts@@ -16,7 +16,6 @@ import {getCursorSpringConfig,resetSpringState,stepSpringValue,- type CursorSpringTuning,} from "./motionSmoothing";import { cursorSetAssets, getCursorStyleSizeMultiplier } from "./uploadedCursorAssets";@@ -57,8 +56,6 @@ export interface CursorRenderConfig {trailLength: number;/** Smoothing factor for cursor interpolation (0–1, lower = smoother/slower) */smoothingFactor: number;- /** Optional multipliers applied on top of the derived cursor spring config. */- springTuning: CursorSpringTuning;/** Directional cursor motion blur amount. */motionBlur: number;/** Click bounce multiplier. */@@ -77,11 +74,6 @@ export const DEFAULT_CURSOR_CONFIG: CursorRenderConfig = {dotAlpha: 0.95,trailLength: 0,smoothingFactor: 0.18,- springTuning: {- stiffnessMultiplier: 1,- dampingMultiplier: 1,- massMultiplier: 1,- },motionBlur: 0,clickBounce: 1,clickBounceDuration: DEFAULT_CURSOR_CLICK_BOUNCE_DURATION,@@ -652,10 +644,7 @@ function getCursorViewportScale(viewport: CursorViewportRect) {return Math.max(MIN_CURSOR_VIEWPORT_SCALE, viewport.width / REFERENCE_WIDTH);}-function getCursorSwaySpringConfig(- smoothingFactor: number,- springTuning: CursorSpringTuning,-) {+function getCursorSwaySpringConfig(smoothingFactor: number) {const baseConfig = getCursorSpringConfig(Math.min(2,@@ -664,7 +653,6 @@ function getCursorSwaySpringConfig(smoothingFactor * CURSOR_SWAY_SMOOTHING_MULTIPLIER + CURSOR_SWAY_SMOOTHING_OFFSET,),),- springTuning,);return {@@ -712,16 +700,14 @@ export class SmoothedCursorState {public y = 0.5;public trail: Array<{ x: number; y: number }> = [];private smoothingFactor: number;- private springTuning: CursorSpringTuning;private trailLength: number;private initialized = false;private lastTimeMs: number | null = null;private xSpring = createSpringState(0.5);private ySpring = createSpringState(0.5);- constructor(config: Pick<CursorRenderConfig, "smoothingFactor" | "trailLength" | "springTuning">) {+ constructor(config: Pick<CursorRenderConfig, "smoothingFactor" | "trailLength">) {this.smoothingFactor = config.smoothingFactor;- this.springTuning = config.springTuning;this.trailLength = config.trailLength;}@@ -755,7 +741,7 @@ export class SmoothedCursorState {this.lastTimeMs === null ? 1000 / 60 : Math.max(1, timeMs - this.lastTimeMs);this.lastTimeMs = timeMs;- const springConfig = getCursorSpringConfig(this.smoothingFactor, this.springTuning);+ const springConfig = getCursorSpringConfig(this.smoothingFactor);this.x = stepSpringValue(this.xSpring, targetX, deltaMs, springConfig);this.y = stepSpringValue(this.ySpring, targetY, deltaMs, springConfig);}@@ -764,10 +750,6 @@ export class SmoothedCursorState {this.smoothingFactor = smoothingFactor;}- setSpringTuning(springTuning: CursorSpringTuning): void {- this.springTuning = springTuning;- }-snapTo(targetX: number, targetY: number, timeMs: number): void {this.x = targetX;this.y = targetY;@@ -809,14 +791,7 @@ export class PixiCursorOverlay {private swaySpring = createSpringState(0);constructor(config: Partial<CursorRenderConfig> = {}) {- this.config = {- ...DEFAULT_CURSOR_CONFIG,- ...config,- springTuning: {- ...DEFAULT_CURSOR_CONFIG.springTuning,- ...config.springTuning,- },- };+ this.config = { ...DEFAULT_CURSOR_CONFIG, ...config };this.state = new SmoothedCursorState(this.config);this.container = new Container();@@ -888,14 +863,6 @@ export class PixiCursorOverlay {this.state.setSmoothingFactor(smoothingFactor);}- setSpringTuning(springTuning: CursorSpringTuning) {- this.config.springTuning = {- ...DEFAULT_CURSOR_CONFIG.springTuning,- ...springTuning,- };- this.state.setSpringTuning(this.config.springTuning);- }-setMotionBlur(motionBlur: number) {this.config.motionBlur = Math.max(0, motionBlur);this.container.filters = this.config.motionBlur > 0 ? [this.cursorMotionBlurFilter] : null;@@ -1128,7 +1095,7 @@ export class PixiCursorOverlay {this.swaySpring,targetRotation,deltaMs,- getCursorSwaySpringConfig(this.config.smoothingFactor, this.config.springTuning),+ getCursorSwaySpringConfig(this.config.smoothingFactor),);if (Math.abs(this.swayRotation) < 0.0001 && targetRotation === 0) {diff --git a/src/components/video-editor/videoPlayback/motionSmoothing.ts b/src/components/video-editor/videoPlayback/motionSmoothing.tsindex 60dce08f..1f5c4392 100644--- a/src/components/video-editor/videoPlayback/motionSmoothing.ts+++ b/src/components/video-editor/videoPlayback/motionSmoothing.ts@@ -1,4 +1,4 @@-// Friendly reminder: Recordly is licensed under AGPL-3.0, author @webadderall, repo-> https://github.com/webadderall/Recordly+// Friendly reminder: Recordly is licensed under AGPL-3.0, author @webadderall, repo-> https://github.com/webadderallorg/Recordly// Please use this code with the right attribution.export interface SpringState {@@ -15,37 +15,9 @@ export interface SpringConfig {restSpeed?: number;}-export interface CursorSpringTuning {- stiffnessMultiplier?: number;- dampingMultiplier?: number;- massMultiplier?: number;-}-const CURSOR_SMOOTHING_MIN = 0;const CURSOR_SMOOTHING_MAX = 2;const CURSOR_SMOOTHING_LEGACY_MAX = 0.5;-const DEFAULT_CURSOR_STIFFNESS_BOOST = 1.12;--function clampSpringMultiplier(value: number | undefined) {- if (typeof value !== "number" || !Number.isFinite(value)) {- return 1;- }-- const numericValue = value;- return Math.min(3, Math.max(0.25, numericValue));-}--function applyCursorSpringTuning(- config: SpringConfig,- tuning?: CursorSpringTuning,-): SpringConfig {- return {- ...config,- stiffness: config.stiffness * clampSpringMultiplier(tuning?.stiffnessMultiplier),- damping: config.damping * clampSpringMultiplier(tuning?.dampingMultiplier),- mass: config.mass * clampSpringMultiplier(tuning?.massMultiplier),- };-}export function createSpringState(initialValue = 0): SpringState {return {@@ -219,20 +191,17 @@ export function stepSpringValue(return state.value;}-export function getCursorSpringConfig(- smoothingFactor: number,- tuning?: CursorSpringTuning,-): SpringConfig {+export function getCursorSpringConfig(smoothingFactor: number): SpringConfig {const clamped = Math.min(CURSOR_SMOOTHING_MAX, Math.max(CURSOR_SMOOTHING_MIN, smoothingFactor));if (clamped <= 0) {- return applyCursorSpringTuning({+ return {stiffness: 1000,damping: 100,mass: 1,restDelta: 0.0001,restSpeed: 0.001,- }, tuning);+ };}if (clamped <= CURSOR_SMOOTHING_LEGACY_MAX) {@@ -245,13 +214,13 @@ export function getCursorSpringConfig(),);- return applyCursorSpringTuning({- stiffness: (760 - legacyNormalized * 420) * DEFAULT_CURSOR_STIFFNESS_BOOST,+ return {+ stiffness: 760 - legacyNormalized * 420,damping: 34 + legacyNormalized * 24,- mass: 0.85 + legacyNormalized * 0.55,+ mass: 0.55 + legacyNormalized * 0.45,restDelta: 0.0002,restSpeed: 0.01,- }, tuning);+ };}const extendedNormalized = Math.min(@@ -263,13 +232,13 @@ export function getCursorSpringConfig(),);- return applyCursorSpringTuning({- stiffness: (340 - extendedNormalized * 180) * DEFAULT_CURSOR_STIFFNESS_BOOST,+ return {+ stiffness: 340 - extendedNormalized * 180,damping: 58 + extendedNormalized * 22,- mass: 1.35 + extendedNormalized * 0.45,+ mass: 1 + extendedNormalized * 0.35,restDelta: 0.0002,restSpeed: 0.01,- }, tuning);+ };}export function getZoomSpringConfig(smoothnessFactor = 0.5): SpringConfig {diff --git a/src/components/video-editor/videoPlayback/videoEventHandlers.test.ts b/src/components/video-editor/videoPlayback/videoEventHandlers.test.tsindex 44414c53..aca357f9 100644--- a/src/components/video-editor/videoPlayback/videoEventHandlers.test.ts+++ b/src/components/video-editor/videoPlayback/videoEventHandlers.test.ts@@ -151,29 +151,4 @@ describe("createVideoEventHandlers", () => {handlers.dispose();expect(cancelVideoFrameCallback).toHaveBeenCalledWith(23);});-- it("skips removed footage after a paused seek", () => {- const video = createMockVideo({- currentTime: 1.25,- paused: true,- });- const onTimeUpdate = vi.fn();- const handlers = createVideoEventHandlers({- video,- isSeekingRef: createMutableRef(true),- isPlayingRef: createMutableRef(false),- allowPlaybackRef: createMutableRef(true),- currentTimeRef: createMutableRef(0),- timeUpdateAnimationRef: createMutableRef<number | null>(null),- onPlayStateChange: vi.fn(),- onTimeUpdate,- trimRegionsRef: createMutableRef([{ id: "trim-1", startMs: 1000, endMs: 2000 }]),- speedRegionsRef: createMutableRef([]),- });-- handlers.handleSeeked();-- expect(video.currentTime).toBe(2);- expect(onTimeUpdate).toHaveBeenLastCalledWith(2);- });});diff --git a/src/components/video-editor/videoPlayback/videoEventHandlers.ts b/src/components/video-editor/videoPlayback/videoEventHandlers.tsindex 113d420b..fd544654 100644--- a/src/components/video-editor/videoPlayback/videoEventHandlers.ts+++ b/src/components/video-editor/videoPlayback/videoEventHandlers.ts@@ -167,8 +167,8 @@ export function createVideoEventHandlers(params: VideoEventHandlersParams) {const currentTimeMs = video.currentTime * 1000;const activeTrimRegion = findActiveTrimRegion(currentTimeMs);- // Never leave the preview parked on removed footage after a seek.- if (activeTrimRegion) {+ // If we seeked into a trim region while playing, skip to the end+ if (activeTrimRegion && isPlayingRef.current && !video.paused) {skipPastTrimRegion(activeTrimRegion);} else {emitTime(video.currentTime);diff --git a/src/components/video-editor/videoPlayback/zoomAnimation.test.ts b/src/components/video-editor/videoPlayback/zoomAnimation.test.tsindex 472cf579..2dd2bff7 100644--- a/src/components/video-editor/videoPlayback/zoomAnimation.test.ts+++ b/src/components/video-editor/videoPlayback/zoomAnimation.test.ts@@ -208,31 +208,17 @@ describe("getCursorSpringConfig", () => {const c = getCursorSpringConfig(0.25);expect(c.stiffness).toBeLessThan(760);expect(c.stiffness).toBeGreaterThan(300);- expect(c.mass).toBeGreaterThan(1);});it("returns config in extended range at 1.5", () => {const c = getCursorSpringConfig(1.5);expect(c.stiffness).toBeLessThan(340);- expect(c.mass).toBeGreaterThan(1.6);+ expect(c.mass).toBeGreaterThan(1);});it("clamps at max smoothing", () => {expect(getCursorSpringConfig(999)).toEqual(getCursorSpringConfig(2));});-- it("applies cursor spring tuning multipliers", () => {- const untuned = getCursorSpringConfig(0.5);- const tuned = getCursorSpringConfig(0.5, {- stiffnessMultiplier: 1.5,- dampingMultiplier: 0.75,- massMultiplier: 1.25,- });-- expect(tuned.stiffness).toBeCloseTo(untuned.stiffness * 1.5, 6);- expect(tuned.damping).toBeCloseTo(untuned.damping * 0.75, 6);- expect(tuned.mass).toBeCloseTo(untuned.mass * 1.25, 6);- });});// ---------------------------------------------------------------------------@@ -332,17 +318,6 @@ describe("computeRegionStrength", () => {expect(s).toBeGreaterThan(0);expect(s).toBeLessThan(1);});-- it("shifts zoom timing when custom durations are provided", () => {- const defaultStrength = computeRegionStrength(region, region.startMs);- const fasterStrength = computeRegionStrength(region, region.startMs, {- zoomInDurationMs: 300,- zoomOutDurationMs: 300,- });-- expect(fasterStrength).not.toBe(defaultStrength);- expect(fasterStrength).toBeGreaterThan(defaultStrength);- });});// ---------------------------------------------------------------------------diff --git a/src/components/video-editor/videoPlayback/zoomRegionUtils.ts b/src/components/video-editor/videoPlayback/zoomRegionUtils.tsindex 4566455d..55164cf1 100644--- a/src/components/video-editor/videoPlayback/zoomRegionUtils.ts+++ b/src/components/video-editor/videoPlayback/zoomRegionUtils.ts@@ -15,8 +15,6 @@ const ZOOM_ANIMATION_LEAD_MS = 200;type DominantRegionOptions = {connectZooms?: boolean;- zoomInDurationMs?: number;- zoomOutDurationMs?: number;};type ConnectedRegionPair = {@@ -42,17 +40,10 @@ function easeConnectedPan(value: number) {return cubicBezier(0.1, 0.0, 0.2, 1.0, value);}-export function computeRegionStrength(- region: ZoomRegion,- timeMs: number,- options: Pick<DominantRegionOptions, "zoomInDurationMs" | "zoomOutDurationMs"> = {},-) {- const zoomInDurationMs = Math.max(1, options.zoomInDurationMs ?? ZOOM_IN_TRANSITION_WINDOW_MS);- const zoomOutDurationMs = Math.max(1, options.zoomOutDurationMs ?? TRANSITION_WINDOW_MS);+export function computeRegionStrength(region: ZoomRegion, timeMs: number) {const adjustedTimeMs = timeMs - ZOOM_ANIMATION_LEAD_MS;- const leadInStart = region.startMs + ZOOM_IN_OVERLAP_MS - ZOOM_IN_TRANSITION_WINDOW_MS;let zoomOutStart = region.endMs - ZOOM_OUT_EARLY_START_MS;- let zoomInEnd = leadInStart + zoomInDurationMs;+ let zoomInEnd = region.startMs + ZOOM_IN_OVERLAP_MS;if (zoomInEnd > zoomOutStart) {const midpoint = (zoomInEnd + zoomOutStart) / 2;@@ -60,14 +51,15 @@ export function computeRegionStrength(zoomOutStart = midpoint;}- const leadOutEnd = zoomOutStart + zoomOutDurationMs;+ const leadInStart = zoomInEnd - ZOOM_IN_TRANSITION_WINDOW_MS;+ const leadOutEnd = zoomOutStart + TRANSITION_WINDOW_MS;if (adjustedTimeMs < leadInStart || adjustedTimeMs > leadOutEnd) {return 0;}if (adjustedTimeMs < zoomInEnd) {- const progress = (adjustedTimeMs - leadInStart) / zoomInDurationMs;+ const progress = (adjustedTimeMs - leadInStart) / ZOOM_IN_TRANSITION_WINDOW_MS;return easeOutZoom(progress);}@@ -75,7 +67,7 @@ export function computeRegionStrength(return 1;}- const progress = clamp01((adjustedTimeMs - zoomOutStart) / zoomOutDurationMs);+ const progress = clamp01((adjustedTimeMs - zoomOutStart) / TRANSITION_WINDOW_MS);return 1 - easeOutZoom(progress);}@@ -119,7 +111,6 @@ function getActiveRegion(regions: ZoomRegion[],timeMs: number,connectedPairs: ConnectedRegionPair[],- options: DominantRegionOptions,) {const activeRegions = regions.map((region) => {@@ -143,7 +134,7 @@ function getActiveRegion(}}- return { region, strength: computeRegionStrength(region, timeMs, options) };+ return { region, strength: computeRegionStrength(region, timeMs) };}).filter((entry) => entry.strength > 0).sort((left, right) => {@@ -251,7 +242,7 @@ export function findDominantRegion(}}- const activeRegion = getActiveRegion(regions, timeMs, connectedPairs, options);+ const activeRegion = getActiveRegion(regions, timeMs, connectedPairs);return activeRegion? { ...activeRegion, transition: null }: { region: null, strength: 0, blendedScale: null, transition: null };diff --git a/src/components/video-editor/videoPlayback/zoomTransform.ts b/src/components/video-editor/videoPlayback/zoomTransform.tsindex ec5b2c76..3e6a00dd 100644--- a/src/components/video-editor/videoPlayback/zoomTransform.ts+++ b/src/components/video-editor/videoPlayback/zoomTransform.ts@@ -1,26 +1,15 @@-import { Container } from "pixi.js";+import { BlurFilter, Container } from "pixi.js";import { MotionBlurFilter } from "pixi-filters/motion-blur";-import { ZoomBlurFilter } from "pixi-filters/zoom-blur";-const PEAK_TRANSLATION_VELOCITY_PPS = 1800;-const PAN_VELOCITY_THRESHOLD_PPS = 24;-const PEAK_LOG_SCALE_VELOCITY_PER_SECOND = 1.45;-const LOG_SCALE_VELOCITY_THRESHOLD = 0.05;-const MAX_DIRECTIONAL_BLUR_PX = 7.5;-const MAX_ZOOM_BLUR_STRENGTH = 0.14;-const PAN_RESPONSE_PER_SECOND = 11;-const ZOOM_RESPONSE_PER_SECOND = 9;+const PEAK_VELOCITY_PPS = 2000;+const MAX_BLUR_PX = 8;+const VELOCITY_THRESHOLD_PPS = 15;export interface MotionBlurState {lastFrameTimeMs: number;prevCamX: number;prevCamY: number;prevCamScale: number;- smoothedPanVelocityX: number;- smoothedPanVelocityY: number;- smoothedLogScaleVelocity: number;- smoothedDirectionalBlur: number;- smoothedRadialBlur: number;initialized: boolean;}@@ -30,18 +19,13 @@ export function createMotionBlurState(): MotionBlurState {prevCamX: 0,prevCamY: 0,prevCamScale: 1,- smoothedPanVelocityX: 0,- smoothedPanVelocityY: 0,- smoothedLogScaleVelocity: 0,- smoothedDirectionalBlur: 0,- smoothedRadialBlur: 0,initialized: false,};}interface TransformParams {cameraContainer: Container;- zoomBlurFilter?: ZoomBlurFilter | null;+ blurFilter: BlurFilter | null;motionBlurFilter?: MotionBlurFilter | null;stageSize: { width: number; height: number };baseMask: { x: number; y: number; width: number; height: number };@@ -82,7 +66,7 @@ interface ZoomTransformGeometry {}function resetMotionEffects(- zoomBlurFilter?: ZoomBlurFilter | null,+ blurFilter: BlurFilter | null,motionBlurFilter?: MotionBlurFilter | null,motionBlurState?: MotionBlurState,) {@@ -92,97 +76,15 @@ function resetMotionEffects(motionBlurFilter.offset = 0;}- if (zoomBlurFilter) {- zoomBlurFilter.strength = 0;- zoomBlurFilter.innerRadius = 0;- zoomBlurFilter.radius = -1;+ if (blurFilter) {+ blurFilter.blur = 0;}if (motionBlurState) {- motionBlurState.lastFrameTimeMs = 0;- motionBlurState.prevCamX = 0;- motionBlurState.prevCamY = 0;- motionBlurState.prevCamScale = 1;- motionBlurState.smoothedPanVelocityX = 0;- motionBlurState.smoothedPanVelocityY = 0;- motionBlurState.smoothedLogScaleVelocity = 0;- motionBlurState.smoothedDirectionalBlur = 0;- motionBlurState.smoothedRadialBlur = 0;motionBlurState.initialized = false;}}-function mixTowards(current: number, target: number, blendFactor: number) {- return current + (target - current) * blendFactor;-}--function computeSmoothingBlend(deltaSeconds: number, responsePerSecond: number) {- return 1 - Math.exp(-Math.max(0, deltaSeconds) * responsePerSecond);-}--function remapMotionStrength(value: number, threshold: number, peak: number) {- if (!Number.isFinite(value) || value <= threshold) {- return 0;- }-- const span = Math.max(0.0001, peak - threshold);- return Math.min(1, (value - threshold) / span);-}--function squareEase(value: number) {- return value * value;-}--function resolveDirectionalKernelSize(blurStrength: number) {- if (blurStrength >= 5.5) {- return 13;- }-- if (blurStrength >= 3) {- return 11;- }-- if (blurStrength >= 1.25) {- return 7;- }-- return 5;-}--function computeZoomBlurGeometry({- stageSize,- baseMask,- targetZoomScale,- focusX,- focusY,-}: {- stageSize: { width: number; height: number };- baseMask: { x: number; y: number; width: number; height: number };- targetZoomScale: number;- focusX: number;- focusY: number;-}) {- const safeZoomScale = Math.max(1, targetZoomScale);- const visibleWidth = stageSize.width / safeZoomScale;- const visibleHeight = stageSize.height / safeZoomScale;- const visibleHalfDiagonal = Math.hypot(visibleWidth / 2, visibleHeight / 2);- const focusStagePxX = baseMask.x + focusX * baseMask.width;- const focusStagePxY = baseMask.y + focusY * baseMask.height;- const outerRadius = Math.max(- Math.hypot(focusStagePxX, focusStagePxY),- Math.hypot(stageSize.width - focusStagePxX, focusStagePxY),- Math.hypot(focusStagePxX, stageSize.height - focusStagePxY),- Math.hypot(stageSize.width - focusStagePxX, stageSize.height - focusStagePxY),- );-- return {- centerX: focusStagePxX,- centerY: focusStagePxY,- innerRadius: Math.max(18, Math.min(outerRadius - 1, visibleHalfDiagonal)),- radius: Math.max(outerRadius, 1),- };-}-export function computeZoomTransform({stageSize,baseMask,@@ -246,7 +148,7 @@ export function computeFocusFromTransform({export function applyZoomTransform({cameraContainer,- zoomBlurFilter,+ blurFilter,motionBlurFilter,stageSize,baseMask,@@ -270,7 +172,7 @@ export function applyZoomTransform({) {cameraContainer.scale.set(1);cameraContainer.position.set(0, 0);- resetMotionEffects(zoomBlurFilter, motionBlurFilter, motionBlurState);+ resetMotionEffects(blurFilter, motionBlurFilter, motionBlurState);return { scale: 1, x: 0, y: 0 };}@@ -301,115 +203,52 @@ export function applyZoomTransform({motionBlurFilter.velocity = { x: 0, y: 0 };motionBlurFilter.kernelSize = 5;motionBlurFilter.offset = 0;- if (zoomBlurFilter) {- zoomBlurFilter.strength = 0;- }+ if (blurFilter) blurFilter.blur = 0;} else {const dtMs = Math.min(80, Math.max(1, now - motionBlurState.lastFrameTimeMs));const dtSeconds = dtMs / 1000;motionBlurState.lastFrameTimeMs = now;+ // Camera displacement this frame (stage-px)const dx = transform.x - motionBlurState.prevCamX;const dy = transform.y - motionBlurState.prevCamY;- const previousScale = Math.max(0.0001, motionBlurState.prevCamScale);- const scaleRatio = Math.max(0.0001, transform.scale) / previousScale;- const logScaleVelocity = Math.log(scaleRatio) / dtSeconds;+ const dScale = transform.scale - motionBlurState.prevCamScale;motionBlurState.prevCamX = transform.x;motionBlurState.prevCamY = transform.y;motionBlurState.prevCamScale = transform.scale;- const smoothingBlend = computeSmoothingBlend(dtSeconds, PAN_RESPONSE_PER_SECOND);- const zoomSmoothingBlend = computeSmoothingBlend(dtSeconds, ZOOM_RESPONSE_PER_SECOND);- const rawVelocityX = dx / dtSeconds;- const rawVelocityY = dy / dtSeconds;- motionBlurState.smoothedPanVelocityX = mixTowards(- motionBlurState.smoothedPanVelocityX,- rawVelocityX,- smoothingBlend,- );- motionBlurState.smoothedPanVelocityY = mixTowards(- motionBlurState.smoothedPanVelocityY,- rawVelocityY,- smoothingBlend,- );- motionBlurState.smoothedLogScaleVelocity = mixTowards(- motionBlurState.smoothedLogScaleVelocity,- logScaleVelocity,- zoomSmoothingBlend,- );-- const panVelocityX = motionBlurState.smoothedPanVelocityX;- const panVelocityY = motionBlurState.smoothedPanVelocityY;- const panSpeed = Math.hypot(panVelocityX, panVelocityY);- const panStrength = squareEase(- remapMotionStrength(- panSpeed,- PAN_VELOCITY_THRESHOLD_PPS,- PEAK_TRANSLATION_VELOCITY_PPS,- ),- );- const zoomStrength = squareEase(- remapMotionStrength(- Math.abs(motionBlurState.smoothedLogScaleVelocity),- LOG_SCALE_VELOCITY_THRESHOLD,- PEAK_LOG_SCALE_VELOCITY_PER_SECOND,- ),- );-- const targetDirectionalBlur =- panStrength *- (1 - Math.min(0.82, zoomStrength * 0.85)) *- MAX_DIRECTIONAL_BLUR_PX *- motionBlurAmount;- const targetRadialBlur = zoomStrength * MAX_ZOOM_BLUR_STRENGTH * motionBlurAmount;-- motionBlurState.smoothedDirectionalBlur = mixTowards(- motionBlurState.smoothedDirectionalBlur,- targetDirectionalBlur,- smoothingBlend,- );- motionBlurState.smoothedRadialBlur = mixTowards(- motionBlurState.smoothedRadialBlur,- targetRadialBlur,- zoomSmoothingBlend,- );-- const directionalBlur = motionBlurState.smoothedDirectionalBlur;- const radialBlur = motionBlurState.smoothedRadialBlur;- const dirMag = Math.hypot(panVelocityX, panVelocityY) || 1;- const velocityScale = directionalBlur * 1.1;+ // Velocity in px/s (translation + scale-change contribution)+ const velocityX = dx / dtSeconds;+ const velocityY = dy / dtSeconds;+ const scaleVelocity =+ Math.abs(dScale / dtSeconds) * Math.max(stageSize.width, stageSize.height) * 0.5;+ const speed = Math.sqrt(velocityX * velocityX + velocityY * velocityY) + scaleVelocity;++ const normalised = Math.min(1, speed / PEAK_VELOCITY_PPS);+ const targetBlur =+ speed < VELOCITY_THRESHOLD_PPS+ ? 0+ : normalised * normalised * MAX_BLUR_PX * motionBlurAmount;++ const dirMag = Math.sqrt(velocityX * velocityX + velocityY * velocityY) || 1;+ const velocityScale = targetBlur * 1.2;motionBlurFilter.velocity =- directionalBlur > 0.15+ targetBlur > 0? {- x: (panVelocityX / dirMag) * velocityScale,- y: (panVelocityY / dirMag) * velocityScale,+ x: (velocityX / dirMag) * velocityScale,+ y: (velocityY / dirMag) * velocityScale,}: { x: 0, y: 0 };- motionBlurFilter.kernelSize = resolveDirectionalKernelSize(directionalBlur);- motionBlurFilter.offset = directionalBlur > 0.45 ? -0.12 : 0;-- if (zoomBlurFilter) {- const zoomBlurGeometry = computeZoomBlurGeometry({- stageSize,- baseMask,- targetZoomScale: Math.max(zoomScale, transform.scale, 1),- focusX,- focusY,- });+ motionBlurFilter.kernelSize = targetBlur > 4 ? 11 : targetBlur > 1.5 ? 9 : 5;+ motionBlurFilter.offset = targetBlur > 0.5 ? -0.2 : 0;- zoomBlurFilter.center = {- x: zoomBlurGeometry.centerX,- y: zoomBlurGeometry.centerY,- };- zoomBlurFilter.innerRadius = zoomBlurGeometry.innerRadius;- zoomBlurFilter.radius = zoomBlurGeometry.radius;- zoomBlurFilter.strength =- radialBlur * (motionBlurState.smoothedLogScaleVelocity >= 0 ? 0.88 : 1);+ if (blurFilter) {+ blurFilter.blur = 0;}}} else {- resetMotionEffects(zoomBlurFilter, motionBlurFilter, motionBlurState);+ resetMotionEffects(blurFilter, motionBlurFilter, motionBlurState);}return {diff --git a/src/hooks/useScreenRecorder.ts b/src/hooks/useScreenRecorder.tsindex fd3dfae3..994d3e02 100644--- a/src/hooks/useScreenRecorder.ts+++ b/src/hooks/useScreenRecorder.ts@@ -154,7 +154,6 @@ export function useScreenRecorder(): UseScreenRecorderReturn {const micFallbackRecorder = useRef<MediaRecorder | null>(null);const micFallbackChunks = useRef<Blob[]>([]);const micFallbackStartDelayMs = useRef<number | null>(null);- const hideEditorOverlayCursorByDefault = useRef(false);const notifyRecordingFinalizationFailure = useCallback(async (message: string) => {setFinalizing(false);@@ -398,27 +397,21 @@ export function useScreenRecorder(): UseScreenRecorderReturn {const finalizeRecordingSession = useCallback(async (videoPath: string, webcamPath: string | null) => {- const shouldHideOverlayCursor = hideEditorOverlayCursorByDefault.current;try {if (webcamPath) {await window.electronAPI.setCurrentRecordingSession({videoPath,webcamPath,timeOffsetMs: webcamTimeOffsetMs.current,- hideOverlayCursorByDefault: shouldHideOverlayCursor,});} else {- await window.electronAPI.setCurrentVideoPath(videoPath, {- hideOverlayCursorByDefault: shouldHideOverlayCursor,- });+ await window.electronAPI.setCurrentVideoPath(videoPath);}} catch (error) {console.error("Failed to persist recording session metadata:", error);try {- await window.electronAPI.setCurrentVideoPath(videoPath, {- hideOverlayCursorByDefault: shouldHideOverlayCursor,- });+ await window.electronAPI.setCurrentVideoPath(videoPath);} catch (fallbackError) {console.error("Failed to persist fallback video path:", fallbackError);}@@ -915,7 +908,6 @@ export function useScreenRecorder(): UseScreenRecorderReturn {try {const platform = await window.electronAPI.getPlatform();- hideEditorOverlayCursorByDefault.current = false;const existingSource = await window.electronAPI.getSelectedSource();const selectedSource =existingSource ?? (platform === "linux" ? LINUX_PORTAL_SOURCE : null);@@ -1003,7 +995,6 @@ export function useScreenRecorder(): UseScreenRecorderReturn {);if (!nativeResult.success) {if (useNativeWindowsCapture) {- hideEditorOverlayCursorByDefault.current = true;console.warn("Native Windows capture failed, falling back to browser capture:",nativeResult.error ?? nativeResult.message,@@ -1103,7 +1094,6 @@ export function useScreenRecorder(): UseScreenRecorderReturn {}}- const wantsAudioCapture = microphoneEnabled || systemAudioEnabled;const browserCaptureSource = await resolveBrowserCaptureSource(selectedSource);if (@@ -1124,7 +1114,6 @@ export function useScreenRecorder(): UseScreenRecorderReturn {let videoTrack: MediaStreamTrack | undefined;let systemAudioIncluded = false;const mediaDevices = navigator.mediaDevices as DesktopCaptureMediaDevices;- const useLinuxPortal = selectedSource.id === "screen:linux-portal";const browserScreenVideoConstraints = {mandatory: {chromeMediaSource: CHROME_MEDIA_SOURCE,@@ -1138,10 +1127,12 @@ export function useScreenRecorder(): UseScreenRecorderReturn {cursor: "never" as const,};- if (wantsAudioCapture) {- let screenMediaStream: MediaStream;- const acquireLinuxPortalStream = (withAudio: boolean) =>- mediaDevices.getDisplayMedia({+++ const acquireLinuxPortalStream = async (withAudio: boolean): Promise<MediaStream> => {++ try {+ return await mediaDevices.getDisplayMedia({audio: withAudio,video: {displaySurface: "monitor",@@ -1153,6 +1144,43 @@ export function useScreenRecorder(): UseScreenRecorderReturn {selfBrowserSurface: "exclude",surfaceSwitching: "exclude",});+ }++ catch (err) {+ console.warn("Linux portal failed, falling back to desktop capture(no audio):", err);+ if (withAudio) {+ alert("System audio is not supported in fallback mode. Recording will continue without audio.");+ }+++ const sources = await window.electronAPI.getSources({ types: ["screen"] });++ if (!sources.length) {+ throw new Error("No screen sources available");+ }++ const source = sources[0];+ console.log("Using fallback source:", source);++++ return await navigator.mediaDevices.getUserMedia({+ audio: false, //intentional+ video: {+ mandatory: {+ chromeMediaSource: "desktop",+ chromeMediaSourceId: source.id,+ maxWidth: TARGET_WIDTH,+ maxHeight: TARGET_HEIGHT,+ maxFrameRate: TARGET_FRAME_RATE,+ },+ },+ } as any);+ }+ };++ let screenMediaStream: MediaStream;+ const useLinuxPortal = selectedSource.id === "screen:linux-portal";if (systemAudioEnabled) {try {@@ -1257,26 +1285,10 @@ export function useScreenRecorder(): UseScreenRecorderReturn {} else if (micAudioTrack) {stream.current.addTrack(micAudioTrack);}- } else {- const mediaStream = await mediaDevices.getDisplayMedia({- audio: false,- video: {- displaySurface: selectedSource.id?.startsWith("window:")- ? "window"- : "monitor",- width: { ideal: TARGET_WIDTH, max: TARGET_WIDTH },- height: { ideal: TARGET_HEIGHT, max: TARGET_HEIGHT },- frameRate: { ideal: TARGET_FRAME_RATE, max: TARGET_FRAME_RATE },- cursor: "never",- },- selfBrowserSurface: "exclude",- surfaceSwitching: "exclude",- });-- stream.current = mediaStream;- videoTrack = mediaStream.getVideoTracks()[0];- }+++if (!stream.current || !videoTrack) {throw new Error("Media stream is not available.");}@@ -1428,12 +1440,32 @@ export function useScreenRecorder(): UseScreenRecorderReturn {if (webcamRecorder.current?.state === "recording") {webcamRecorder.current.pause();}+ const boundaryMs = Date.now();try {- await window.electronAPI.pauseCursorCapture();+ await window.electronAPI.pauseCursorCapture(boundaryMs);} catch (error) {console.warn("Failed to pause cursor capture:", error);+ try {+ const rollbackResult =+ await window.electronAPI.resumeNativeScreenRecording();+ if (!rollbackResult.success) {+ console.warn(+ "Failed to roll back native pause after cursor pause failure:",+ rollbackResult.error ?? rollbackResult.message,+ );+ }+ } catch (rollbackError) {+ console.warn(+ "Failed to roll back native pause after cursor pause failure:",+ rollbackError,+ );+ }+ if (webcamRecorder.current?.state === "paused") {+ webcamRecorder.current.resume();+ }+ return;}- markRecordingPaused(Date.now());+ markRecordingPaused(boundaryMs);setPaused(true);})();return;@@ -1443,13 +1475,21 @@ export function useScreenRecorder(): UseScreenRecorderReturn {if (webcamRecorder.current?.state === "recording") {webcamRecorder.current.pause();}+ const boundaryMs = Date.now();void (async () => {try {- await window.electronAPI.pauseCursorCapture();+ await window.electronAPI.pauseCursorCapture(boundaryMs);} catch (error) {console.warn("Failed to pause cursor capture:", error);+ if (mediaRecorder.current?.state === "paused") {+ mediaRecorder.current.resume();+ }+ if (webcamRecorder.current?.state === "paused") {+ webcamRecorder.current.resume();+ }+ return;}- markRecordingPaused(Date.now());+ markRecordingPaused(boundaryMs);setPaused(true);})();}@@ -1471,12 +1511,32 @@ export function useScreenRecorder(): UseScreenRecorderReturn {if (webcamRecorder.current?.state === "paused") {webcamRecorder.current.resume();}+ const boundaryMs = Date.now();try {- await window.electronAPI.resumeCursorCapture();+ await window.electronAPI.resumeCursorCapture(boundaryMs);} catch (error) {console.warn("Failed to resume cursor capture:", error);+ try {+ const rollbackResult =+ await window.electronAPI.pauseNativeScreenRecording();+ if (!rollbackResult.success) {+ console.warn(+ "Failed to roll back native resume after cursor resume failure:",+ rollbackResult.error ?? rollbackResult.message,+ );+ }+ } catch (rollbackError) {+ console.warn(+ "Failed to roll back native resume after cursor resume failure:",+ rollbackError,+ );+ }+ if (webcamRecorder.current?.state === "recording") {+ webcamRecorder.current.pause();+ }+ return;}- markRecordingResumed(Date.now());+ markRecordingResumed(boundaryMs);setPaused(false);})();return;@@ -1486,13 +1546,21 @@ export function useScreenRecorder(): UseScreenRecorderReturn {if (webcamRecorder.current?.state === "paused") {webcamRecorder.current.resume();}+ const boundaryMs = Date.now();void (async () => {try {- await window.electronAPI.resumeCursorCapture();+ await window.electronAPI.resumeCursorCapture(boundaryMs);} catch (error) {console.warn("Failed to resume cursor capture:", error);+ if (mediaRecorder.current?.state === "recording") {+ mediaRecorder.current.pause();+ }+ if (webcamRecorder.current?.state === "recording") {+ webcamRecorder.current.pause();+ }+ return;}- markRecordingResumed(Date.now());+ markRecordingResumed(boundaryMs);setPaused(false);})();}diff --git a/src/i18n/locales/en/settings.json b/src/i18n/locales/en/settings.jsonindex 50782b0c..2ad584e4 100644--- a/src/i18n/locales/en/settings.json+++ b/src/i18n/locales/en/settings.json@@ -6,7 +6,7 @@"modeAuto": "Auto","modeManual": "Manual","modeManualDescription": "Set a fixed focus point for this zoom",- "modeAutoDescription": "Camera recenters when the cursor nears the edge of the zoomed view"+ "modeAutoDescription": "Camera follows cursor automatically"},"trim": {"deleteRegion": "Delete Trim Region"@@ -42,15 +42,10 @@},"backgroundBlur": "Background Blur","zoomMotionBlur": "Zoom Motion Blur",- "temporalZoomMotionBlur": "Temporal Zoom Blur",- "temporalZoomMotionBlurDescription": "Control the shutter window and frame samples used by the newer zoom blur pass.",- "zoomMotionBlurSamples": "Blur Samples",- "zoomMotionBlurShutter": "Shutter",- "auto": "Auto","connectZooms": "Connect Zooms","connectZoomsDescription": "Smooth consecutive zoom regions into a continuous camera move.","autoApplyFreshRecordingZooms": "Auto-apply fresh recording zooms",- "autoApplyFreshRecordingZoomsDescription": "Suggest edge-recentering zooms automatically when you open a new recording.",+ "autoApplyFreshRecordingZoomsDescription": "Suggest cursor-follow zooms automatically when you open a new recording.","zoomGeneralTitle": "General","zoomGeneralDescription": "Global motion settings for every zoom transition.","zoomInTitle": "Zoom In",@@ -59,20 +54,6 @@"zoomOutDescription": "Control how the camera exits a zoom region.","connectedZoomTitle": "Between Zooms","connectedZoomDescription": "Tune the glide between consecutive zoom regions when connection is enabled.",- "motionPresetsTitle": "Motion Presets",- "motionPresetsZoomHint": "Zoom motion presets are available in Settings.",- "animationPresets": "Animation Presets",- "cursorMotionPresets": "Cursor Motion Presets",- "motionPresets": {- "focused": {- "label": "Focused",- "description": "Snappier motion for demos, walkthroughs, and everyday recordings."- },- "smooth": {- "label": "Smooth",- "description": "Gentler motion for presentations, keynote-style videos, and polished reveals."- }- },"zoomInDuration": "Zoom In Duration","zoomInOverlap": "Zoom In Overlap","zoomOutDuration": "Zoom Out Duration",@@ -90,9 +71,6 @@},"cursorSize": "Cursor Size","cursorSmoothing": "Cursor Smoothing",- "cursorSpringStiffness": "Cursor Spring Stiffness",- "cursorSpringDamping": "Cursor Spring Damping",- "cursorSpringMass": "Cursor Spring Mass","off": "Off","cursorMotionBlur": "Cursor Motion Blur","cursorClickBounce": "Cursor Click Bounce",@@ -142,6 +120,8 @@"generateFull": "Generate Captions","regenerateFull": "Regenerate Captions","clearFull": "Clear Captions",+ "editCurrent": "Edit current caption",+ "editSaved": "Caption updated","fontSettings": "Font Settings","defaultFont": "Default","fontFamily": "Font",diff --git a/src/i18n/locales/zh-CN/settings.json b/src/i18n/locales/zh-CN/settings.jsonindex e69c7e5b..1c2ddf35 100644--- a/src/i18n/locales/zh-CN/settings.json+++ b/src/i18n/locales/zh-CN/settings.json@@ -54,20 +54,6 @@"zoomOutDescription": "控制镜头离开缩放区域的方式。","connectedZoomTitle": "缩放之间","connectedZoomDescription": "在启用连接缩放时,调整连续缩放区域之间的滑移方式。",- "motionPresetsTitle": "运动预设",- "motionPresetsZoomHint": "缩放运动预设已移到“设置”中。",- "animationPresets": "动画预设",- "cursorMotionPresets": "光标运动预设",- "motionPresets": {- "focused": {- "label": "专注",- "description": "更利落,适合演示、讲解和日常录屏。"- },- "smooth": {- "label": "平滑",- "description": "更柔和,适合展示、发布会风格视频和更从容的镜头。"- }- },"zoomInDuration": "进入时长","zoomInOverlap": "进入重叠","zoomOutDuration": "退出时长",@@ -85,9 +71,6 @@},"cursorSize": "光标大小","cursorSmoothing": "光标平滑",- "cursorSpringStiffness": "光标弹簧刚度",- "cursorSpringDamping": "光标弹簧阻尼",- "cursorSpringMass": "光标弹簧质量","off": "关","cursorMotionBlur": "光标运动模糊","cursorClickBounce": "光标点击弹跳",@@ -137,6 +120,8 @@"generateFull": "生成字幕","regenerateFull": "重新生成字幕","clearFull": "清除字幕",+ "editCurrent": "编辑当前字幕",+ "editSaved": "字幕已更新","fontSettings": "字体设置","defaultFont": "默认","fontFamily": "字体",diff --git a/src/lib/exporter/forwardFrameSource.ts b/src/lib/exporter/forwardFrameSource.tsindex 77272bc5..2c3086c7 100644--- a/src/lib/exporter/forwardFrameSource.ts+++ b/src/lib/exporter/forwardFrameSource.ts@@ -36,8 +36,6 @@ export class ForwardFrameSource {private heldFrame: VideoFrame | null = null;private heldFrameSec = 0;private lastTargetTimeSec = 0;- private lastFrameIntervalSec = 0;- private resolvedDecodedDurationSec: number | null = null;private firstFrameTimestampUs: number | null = null;private frameTimelineOffsetUs = 0;@@ -299,10 +297,6 @@ export class ForwardFrameSource {while (!this.cancelled) {const nextFrame = await this.getNextFrame();if (!nextFrame) {- this.resolvedDecodedDurationSec = Math.max(- this.heldFrameSec,- this.heldFrameSec + Math.max(0, this.lastFrameIntervalSec),- );return new VideoFrame(this.heldFrame, {timestamp: this.heldFrame.timestamp,});@@ -326,7 +320,6 @@ export class ForwardFrameSource {});}- this.lastFrameIntervalSec = Math.max(0, nextFrameSec - this.heldFrameSec);this.heldFrame.close();this.heldFrame = nextFrame;this.heldFrameSec = nextFrameSec;@@ -335,14 +328,6 @@ export class ForwardFrameSource {return null;}- getResolvedDurationSec(): number | null {- return this.resolvedDecodedDurationSec;- }-- hasReachedEndOfStream(): boolean {- return this.decodeDone && this.pendingFrames.length === 0;- }-cancel(): void {this.cancelled = true;if (this.frameResolve) {@@ -412,8 +397,6 @@ export class ForwardFrameSource {this.decodeDone = false;this.decodeError = null;this.lastTargetTimeSec = 0;- this.lastFrameIntervalSec = 0;- this.resolvedDecodedDurationSec = null;this.firstFrameTimestampUs = null;this.frameTimelineOffsetUs = 0;}diff --git a/src/lib/exporter/frameRenderer.test.ts b/src/lib/exporter/frameRenderer.test.tsindex 671c1c4b..fdaf9d7c 100644--- a/src/lib/exporter/frameRenderer.test.ts+++ b/src/lib/exporter/frameRenderer.test.ts@@ -86,7 +86,6 @@ type MockContext = {closePath: MockFunction;clip: MockFunction;drawImage: MockFunction;- fillRect: MockFunction;save: MockFunction;restore: MockFunction;translate: MockFunction;@@ -215,7 +214,6 @@ function createMockContext() {closePath: vi.fn(),clip: vi.fn(),drawImage: vi.fn(),- fillRect: vi.fn(),save: vi.fn(),restore: vi.fn(),translate: vi.fn(),@@ -275,9 +273,6 @@ describe("FrameRenderer webcam export path", () => {},document: {createElement: vi.fn((tag: string) => {- if (tag === "video") {- return new FakeVideoElement();- }if (tag !== "canvas") {throw new Error(`Unexpected element requested in test: ${tag}`);}@@ -448,7 +443,7 @@ describe("FrameRenderer webcam export path", () => {expect(createdCanvases).toHaveLength(2);});- it("prefers decoder-backed sync for video wallpapers during export", async () => {+ it("prefers decoder-backed video wallpapers during export", async () => {const renderer = new FrameRenderer({width: 1920,height: 1080,diff --git a/src/lib/exporter/frameRenderer.ts b/src/lib/exporter/frameRenderer.tsindex 1f458616..5f9b49bb 100644--- a/src/lib/exporter/frameRenderer.ts+++ b/src/lib/exporter/frameRenderer.ts@@ -1,6 +1,5 @@-import { Application, Container, Graphics, Rectangle, Sprite, Texture } from "pixi.js";+import { Application, BlurFilter, Container, Graphics, Sprite, Texture } from "pixi.js";import { MotionBlurFilter } from "pixi-filters/motion-blur";-import { ZoomBlurFilter } from "pixi-filters/zoom-blur";import type {AnnotationRegion,AutoCaptionSettings,@@ -65,19 +64,12 @@ import {} from "@/lib/extensions/renderHooks";import { applyCanvasSceneTransform } from "@/lib/extensions/sceneTransform";import { drawSquircleOnCanvas, drawSquircleOnGraphics } from "@/lib/geometry/squircle";-import {- clampMediaTimeToDuration,- getEffectiveVideoStreamDurationSeconds,-} from "@/lib/mediaTiming";+import { clampMediaTimeToDuration } from "@/lib/mediaTiming";import { isVideoWallpaperSource } from "@/lib/wallpapers";import { renderAnnotations } from "./annotationRenderer";import { renderCaptions } from "./captionRenderer";import { ForwardFrameSource } from "./forwardFrameSource";import { resolveMediaElementSource } from "./localMediaSource";-import {- buildTemporalSamplePlanUs,- getTemporalMotionBlurConfig,-} from "./temporalMotionBlur";interface FrameRenderConfig {width: number;@@ -89,9 +81,6 @@ interface FrameRenderConfig {shadowIntensity: number;backgroundBlur: number;zoomMotionBlur?: number;- zoomTemporalMotionBlur?: number;- zoomMotionBlurSampleCount?: number | null;- zoomMotionBlurShutterFraction?: number | null;connectZooms?: boolean;zoomInDurationMs?: number;zoomInOverlapMs?: number;@@ -119,9 +108,6 @@ interface FrameRenderConfig {cursorStyle?: CursorStyle;cursorSize?: number;cursorSmoothing?: number;- cursorSpringStiffnessMultiplier?: number;- cursorSpringDampingMultiplier?: number;- cursorSpringMassMultiplier?: number;zoomSmoothness?: number;zoomClassicMode?: boolean;cursorMotionBlur?: number;@@ -162,14 +148,6 @@ interface LayoutCache {};}-interface RenderSnapshot {- timeMs: number;- cursorTimeMs: number;- smoothedCursor: ReturnType<typeof mapSmoothedCursorToCanvasNormalized>;- sceneTransform: { scale: number; x: number; y: number };- zoom: { scale: number; focusX: number; focusY: number; progress: number };-}-function createAnimationState(): AnimationState {return {scale: 1,@@ -206,22 +184,17 @@ export class FrameRenderer {private videoTextureSource: VideoTextureSource | null = null;private backgroundSprite: HTMLCanvasElement | null = null;private maskGraphics: Graphics | null = null;- private zoomBlurFilter: ZoomBlurFilter | null = null;+ private blurFilter: BlurFilter | null = null;private motionBlurFilter: MotionBlurFilter | null = null;private shadowCanvas: HTMLCanvasElement | null = null;private shadowCtx: CanvasRenderingContext2D | null = null;private compositeCanvas: HTMLCanvasElement | null = null;private compositeCtx: CanvasRenderingContext2D | null = null;- private temporalAccumulationCanvas: HTMLCanvasElement | null = null;- private temporalAccumulationCtx: CanvasRenderingContext2D | null = null;private backgroundForwardFrameSource: ForwardFrameSource | null = null;- private backgroundForwardFrameSourceUrl: string | null = null;- private backgroundForwardFrameDurationSec: number | null = null;private backgroundDecodedFrame: VideoFrame | null = null;private backgroundVideoElement: HTMLVideoElement | null = null;private backgroundCtx: CanvasRenderingContext2D | null = null;private backgroundSeekPromise: Promise<void> | null = null;- private lastSyncedBackgroundLoopTimeSec: number | null = null;private cleanupBackgroundSource: (() => void) | null = null;private config: FrameRenderConfig;private animationState: AnimationState;@@ -320,11 +293,6 @@ export class FrameRenderer {style: this.config.cursorStyle ?? "tahoe",smoothingFactor:this.config.cursorSmoothing ?? DEFAULT_CURSOR_CONFIG.smoothingFactor,- springTuning: {- stiffnessMultiplier: this.config.cursorSpringStiffnessMultiplier,- dampingMultiplier: this.config.cursorSpringDampingMultiplier,- massMultiplier: this.config.cursorSpringMassMultiplier,- },motionBlur: this.config.cursorMotionBlur ?? 0,clickBounce: this.config.cursorClickBounce ?? DEFAULT_CURSOR_CONFIG.clickBounce,clickBounceDuration:@@ -339,19 +307,13 @@ export class FrameRenderer {await this.setupWebcamSource();await this.setupFrame();- if ((this.config.zoomMotionBlur ?? 0) > 0) {- this.zoomBlurFilter = new ZoomBlurFilter({ strength: 0 });- this.motionBlurFilter = new MotionBlurFilter([0, 0], 5, 0);- this.videoContainer.filterArea = new Rectangle(- 0,- 0,- this.config.width,- this.config.height,- );- this.videoContainer.filters = [this.zoomBlurFilter, this.motionBlurFilter];- } else {- this.videoContainer.filters = null;- }+ // Setup blur filter for video container+ this.blurFilter = new BlurFilter();+ this.blurFilter.quality = 5;+ this.blurFilter.resolution = this.app.renderer.resolution;+ this.blurFilter.blur = 0;+ this.motionBlurFilter = new MotionBlurFilter([0, 0], 5, 0);+ this.videoContainer.filters = [this.blurFilter, this.motionBlurFilter];// Setup composite canvas for final output with shadowsthis.compositeCanvas = document.createElement("canvas");@@ -367,19 +329,6 @@ export class FrameRenderer {throw new Error("Failed to get 2D context for composite canvas");}- this.temporalAccumulationCanvas = document.createElement("canvas");- this.temporalAccumulationCanvas.width = this.config.width;- this.temporalAccumulationCanvas.height = this.config.height;- this.temporalAccumulationCtx = configureHighQuality2DContext(- this.temporalAccumulationCanvas.getContext("2d", {- willReadFrequently: true,- }),- );-- if (!this.temporalAccumulationCtx) {- throw new Error("Failed to get 2D context for temporal accumulation canvas");- }-// Setup shadow canvas if neededif (this.config.showShadow) {this.shadowCanvas = document.createElement("canvas");@@ -422,12 +371,9 @@ export class FrameRenderer {this.backgroundForwardFrameSource?.cancel();void this.backgroundForwardFrameSource?.destroy();this.backgroundForwardFrameSource = null;- this.backgroundForwardFrameSourceUrl = null;- this.backgroundForwardFrameDurationSec = null;this.closeBackgroundDecodedFrame();this.cleanupBackgroundSource?.();this.cleanupBackgroundSource = null;- this.lastSyncedBackgroundLoopTimeSec = null;if (this.backgroundVideoElement) {this.backgroundVideoElement.pause();this.backgroundVideoElement.src = "";@@ -446,18 +392,8 @@ export class FrameRenderer {try {const frameSource = new ForwardFrameSource();- const metadata = await frameSource.initialize(videoSrc);+ await frameSource.initialize(videoSrc);this.backgroundForwardFrameSource = frameSource;- this.backgroundForwardFrameSourceUrl = videoSrc;- this.backgroundForwardFrameDurationSec = getEffectiveVideoStreamDurationSeconds(- {- duration: metadata?.duration,- streamDuration: metadata?.streamDuration,- },- );- this.backgroundVideoElement = null;- this.backgroundSeekPromise = null;- this.lastSyncedBackgroundLoopTimeSec = null;this.backgroundSprite = bgCanvas;return;} catch (error) {@@ -503,7 +439,6 @@ export class FrameRenderer {});this.backgroundVideoElement = video;- this.lastSyncedBackgroundLoopTimeSec = null;this.drawVideoFrameToBackground();this.backgroundSprite = bgCanvas;return;@@ -675,95 +610,14 @@ export class FrameRenderer {this.backgroundDecodedFrame = null;}- private async restartBackgroundForwardFrameSource(): Promise<void> {- const sourceUrl = this.backgroundForwardFrameSourceUrl;- if (!sourceUrl) {- return;- }-- const nextSource = new ForwardFrameSource();- const metadata = await nextSource.initialize(sourceUrl);- const previousSource = this.backgroundForwardFrameSource;-- this.backgroundForwardFrameSource = nextSource;- const effectiveDuration = getEffectiveVideoStreamDurationSeconds({- duration: metadata?.duration,- streamDuration: metadata?.streamDuration,- });- this.backgroundForwardFrameDurationSec =- Number.isFinite(effectiveDuration) && effectiveDuration > 0 ? effectiveDuration : null;- this.lastSyncedBackgroundLoopTimeSec = null;-- previousSource?.cancel();- void previousSource?.destroy();- }-private async syncBackgroundFrame(timeSeconds: number): Promise<void> {if (this.backgroundForwardFrameSource) {- const duration = this.backgroundForwardFrameDurationSec;- const shouldLoop = Number.isFinite(duration) && (duration ?? 0) > 0;- let normalizedTargetTime = shouldLoop- ? ((timeSeconds % duration!) + duration!) % duration!- : Math.max(0, timeSeconds);-- if (- shouldLoop &&- this.lastSyncedBackgroundLoopTimeSec !== null &&- normalizedTargetTime + 0.001 < this.lastSyncedBackgroundLoopTimeSec- ) {- try {- await this.restartBackgroundForwardFrameSource();- } catch (error) {- console.warn(- "[FrameRenderer] Unable to restart looping video wallpaper decoder during export:",- error,- );- }- }-- const decodedFrame =- await this.backgroundForwardFrameSource.getFrameAtTime(normalizedTargetTime);- const resolvedDecodedDuration =- this.backgroundForwardFrameSource.getResolvedDurationSec();- if (- shouldLoop &&- this.backgroundForwardFrameSource.hasReachedEndOfStream() &&- Number.isFinite(resolvedDecodedDuration) &&- (resolvedDecodedDuration ?? 0) > 0 &&- normalizedTargetTime > (resolvedDecodedDuration ?? 0) + 0.001- ) {- this.backgroundForwardFrameDurationSec = resolvedDecodedDuration ?? null;- this.closeBackgroundDecodedFrame();- try {- await this.restartBackgroundForwardFrameSource();- normalizedTargetTime =- ((timeSeconds % resolvedDecodedDuration!) + resolvedDecodedDuration!) %- resolvedDecodedDuration!;- const restartedFrame =- await this.backgroundForwardFrameSource.getFrameAtTime(- normalizedTargetTime,- );- this.backgroundDecodedFrame = restartedFrame;- if (restartedFrame) {- this.lastSyncedBackgroundLoopTimeSec = normalizedTargetTime;- this.drawBackgroundSourceToCanvas(- restartedFrame,- restartedFrame.displayWidth,- restartedFrame.displayHeight,- );- }- return;- } catch (error) {- console.warn(- "[FrameRenderer] Unable to wrap looping video wallpaper at decoded EOF during export:",- error,- );- }- }+ const decodedFrame = await this.backgroundForwardFrameSource.getFrameAtTime(+ Math.max(0, timeSeconds),+ );this.closeBackgroundDecodedFrame();this.backgroundDecodedFrame = decodedFrame;if (decodedFrame) {- this.lastSyncedBackgroundLoopTimeSec = normalizedTargetTime;this.drawBackgroundSourceToCanvas(decodedFrame,decodedFrame.displayWidth,@@ -1238,8 +1092,6 @@ export class FrameRenderer {videoFrame: VideoFrame,timestamp: number,cursorTimestamp = timestamp,- frameDurationUs?: number,- backgroundTimelineTimestamp = timestamp,): Promise<void> {if (!this.app || !this.videoContainer || !this.cameraContainer) {throw new Error("Renderer not initialized");@@ -1247,6 +1099,16 @@ export class FrameRenderer {this.currentVideoTime = timestamp / 1000000;+ if (this.webcamForwardFrameSource || this.webcamVideoElement) {+ const targetTime = Math.max(0, this.currentVideoTime);+ await this.syncWebcamFrame(targetTime);+ }++ // Sync video wallpaper frame+ if (this.backgroundForwardFrameSource || this.backgroundVideoElement) {+ await this.syncBackgroundFrame(this.currentVideoTime);+ }+// Create or update video sprite from VideoFrameif (!this.videoSprite) {const texture = Texture.from(videoFrame as unknown as PixiTextureInput);@@ -1273,140 +1135,6 @@ export class FrameRenderer {return;}- const temporalSnapshot =- typeof frameDurationUs === "number" && frameDurationUs > 0- ? await this.renderTemporalMotionBlurFrame(- timestamp,- cursorTimestamp,- backgroundTimelineTimestamp,- frameDurationUs,- layoutCache,- )- : null;-- if (temporalSnapshot) {- extensionHost.setSmoothedCursor(- temporalSnapshot.smoothedCursor- ? {- timeMs: temporalSnapshot.timeMs,- cx: temporalSnapshot.smoothedCursor.cx,- cy: temporalSnapshot.smoothedCursor.cy,- trail: temporalSnapshot.smoothedCursor.trail,- }- : null,- );-- this.drawFrame();-- if (- this.config.annotationRegions &&- this.config.annotationRegions.length > 0 &&- this.compositeCtx- ) {- const scaleX = this.config.width / BASE_PREVIEW_WIDTH;- const scaleY = this.config.height / BASE_PREVIEW_HEIGHT;- const scaleFactor = (scaleX + scaleY) / 2;-- await renderAnnotations(- this.compositeCtx,- this.config.annotationRegions,- this.config.width,- this.config.height,- temporalSnapshot.timeMs,- scaleFactor,- );- }-- if (- this.config.autoCaptions &&- this.config.autoCaptions.length > 0 &&- this.config.autoCaptionSettings &&- this.compositeCtx- ) {- renderCaptions(- this.compositeCtx,- this.config.autoCaptions,- this.config.autoCaptionSettings,- this.config.width,- this.config.height,- temporalSnapshot.timeMs,- );- }-- if (this.compositeCtx) {- const maskRect = this.layoutCache?.maskRect;- const hookParams = {- width: this.config.width,- height: this.config.height,- timeMs: temporalSnapshot.timeMs,- durationMs: 0,- cursor: temporalSnapshot.smoothedCursor- ? {- cx: temporalSnapshot.smoothedCursor.cx,- cy: temporalSnapshot.smoothedCursor.cy,- interactionType: this.getCursorPosition(- temporalSnapshot.cursorTimeMs,- )?.interactionType,- }- : this.getCursorPosition(temporalSnapshot.cursorTimeMs),- smoothedCursor: temporalSnapshot.smoothedCursor,- videoLayout: maskRect- ? {- maskRect: {- x: maskRect.x,- y: maskRect.y,- width: maskRect.width,- height: maskRect.height,- },- borderRadius: this.config.borderRadius ?? 0,- padding: this.config.padding ?? 0,- }- : undefined,- zoom: temporalSnapshot.zoom,- shadow: {- enabled: this.config.showShadow,- intensity: this.config.shadowIntensity,- },- sceneTransform: temporalSnapshot.sceneTransform,- };-- this.compositeCtx.save();- applyCanvasSceneTransform(this.compositeCtx, temporalSnapshot.sceneTransform);- executeExtensionRenderHooks("post-video", this.compositeCtx, hookParams);- executeExtensionRenderHooks("post-zoom", this.compositeCtx, hookParams);- executeExtensionRenderHooks("post-cursor", this.compositeCtx, hookParams);- this.emitCursorInteractions(temporalSnapshot.cursorTimeMs);- executeExtensionCursorEffects(- this.compositeCtx,- temporalSnapshot.timeMs,- this.config.width,- this.config.height,- {- zoom: hookParams.zoom,- sceneTransform: hookParams.sceneTransform,- videoLayout: hookParams.videoLayout,- },- );- this.compositeCtx.restore();-- executeExtensionRenderHooks("post-webcam", this.compositeCtx, hookParams);- executeExtensionRenderHooks("post-annotations", this.compositeCtx, hookParams);- executeExtensionRenderHooks("final", this.compositeCtx, hookParams);- }-- return;- }-- if (this.webcamForwardFrameSource || this.webcamVideoElement) {- const targetTime = Math.max(0, this.currentVideoTime);- await this.syncWebcamFrame(targetTime);- }-- // Sync video wallpaper frame- if (this.backgroundForwardFrameSource || this.backgroundVideoElement) {- await this.syncBackgroundFrame(Math.max(0, backgroundTimelineTimestamp / 1_000_000));- }-const timeMs = this.currentVideoTime * 1000;const cursorTimeMs = cursorTimestamp / 1000;@@ -1450,7 +1178,7 @@ export class FrameRenderer {// Apply transform once with maximum motion intensity from all ticksapplyZoomTransform({cameraContainer: this.cameraContainer,- zoomBlurFilter: this.zoomBlurFilter,+ blurFilter: this.blurFilter,motionBlurFilter: this.motionBlurFilter,stageSize: layoutCache.stageSize,baseMask: layoutCache.maskRect,@@ -1733,8 +1461,6 @@ export class FrameRenderer {timeMs,{connectZooms: this.config.connectZooms,- zoomInDurationMs: this.config.zoomInDurationMs,- zoomOutDurationMs: this.config.zoomOutDurationMs,},);@@ -1875,159 +1601,6 @@ export class FrameRenderer {);}- private async renderSceneSample(- timestamp: number,- cursorTimestamp: number,- backgroundTimelineTimestamp: number,- layoutCache: LayoutCache,- useVelocityMotionBlur: boolean,- ): Promise<RenderSnapshot> {- if (!this.app || !this.cameraContainer) {- throw new Error("Renderer not initialized");- }-- this.currentVideoTime = timestamp / 1_000_000;-- if (this.webcamForwardFrameSource || this.webcamVideoElement) {- await this.syncWebcamFrame(Math.max(0, this.currentVideoTime));- }-- if (this.backgroundForwardFrameSource || this.backgroundVideoElement) {- await this.syncBackgroundFrame(Math.max(0, backgroundTimelineTimestamp / 1_000_000));- }-- const timeMs = this.currentVideoTime * 1000;- const cursorTimeMs = cursorTimestamp / 1000;-- if (this.cursorOverlay) {- this.cursorOverlay.update(- this.config.cursorTelemetry ?? [],- cursorTimeMs,- layoutCache.maskRect,- this.config.showCursor ?? true,- false,- );- }-- const smoothedCursor = mapSmoothedCursorToCanvasNormalized(- this.cursorOverlay?.getSmoothedCursorSnapshot() ?? null,- {- maskRect: layoutCache.maskRect,- canvasWidth: this.config.width,- canvasHeight: this.config.height,- },- );-- const motionIntensity = this.updateAnimationState(timeMs);-- applyZoomTransform({- cameraContainer: this.cameraContainer,- zoomBlurFilter: this.zoomBlurFilter,- motionBlurFilter: this.motionBlurFilter,- stageSize: layoutCache.stageSize,- baseMask: layoutCache.maskRect,- zoomScale: this.animationState.scale,- zoomProgress: this.animationState.progress,- focusX: this.animationState.focusX,- focusY: this.animationState.focusY,- motionIntensity,- motionVector: this.lastMotionVector,- isPlaying: true,- motionBlurAmount: useVelocityMotionBlur ? (this.config.zoomMotionBlur ?? 0) : 0,- transformOverride: {- scale: this.animationState.appliedScale,- x: this.animationState.x,- y: this.animationState.y,- },- motionBlurState: this.motionBlurState,- frameTimeMs: timeMs,- });-- this.app.renderer.render(this.app.stage);- this.compositeWithShadows();-- return {- timeMs,- cursorTimeMs,- smoothedCursor,- sceneTransform: {- scale: this.animationState.appliedScale,- x: this.animationState.x,- y: this.animationState.y,- },- zoom: {- scale: this.animationState.scale,- focusX: this.animationState.focusX,- focusY: this.animationState.focusY,- progress: this.animationState.progress,- },- };- }-- private async renderTemporalMotionBlurFrame(- timestamp: number,- cursorTimestamp: number,- backgroundTimelineTimestamp: number,- frameDurationUs: number,- layoutCache: LayoutCache,- ): Promise<RenderSnapshot | null> {- if (- !this.compositeCanvas ||- !this.compositeCtx ||- !this.temporalAccumulationCtx- ) {- return null;- }-- const blurConfig = getTemporalMotionBlurConfig(- this.config.zoomTemporalMotionBlur ?? this.config.zoomMotionBlur,- {- sampleCount: this.config.zoomMotionBlurSampleCount,- shutterFraction: this.config.zoomMotionBlurShutterFraction,- },- );- if (!blurConfig) {- return null;- }-- const samplePlan = buildTemporalSamplePlanUs(frameDurationUs, blurConfig);-- this.temporalAccumulationCtx.clearRect(0, 0, this.config.width, this.config.height);-- let centerSnapshot: RenderSnapshot | null = null;- let lastSnapshot: RenderSnapshot | null = null;-- for (const { offsetUs: sampleOffsetUs, weight } of samplePlan) {- const sampleTimestamp = Math.max(0, timestamp + sampleOffsetUs);- const sampleCursorTimestamp = Math.max(0, cursorTimestamp + sampleOffsetUs);- const sampleBackgroundTimelineTimestamp = Math.max(- 0,- backgroundTimelineTimestamp + sampleOffsetUs,- );- const snapshot = await this.renderSceneSample(- sampleTimestamp,- sampleCursorTimestamp,- sampleBackgroundTimelineTimestamp,- layoutCache,- false,- );- lastSnapshot = snapshot;- if (Math.abs(sampleOffsetUs) < 0.0001) {- centerSnapshot = snapshot;- }-- this.temporalAccumulationCtx.save();- this.temporalAccumulationCtx.globalCompositeOperation = "lighter";- this.temporalAccumulationCtx.globalAlpha = weight;- this.temporalAccumulationCtx.drawImage(this.compositeCanvas, 0, 0);- this.temporalAccumulationCtx.restore();- }- this.compositeCtx.clearRect(0, 0, this.config.width, this.config.height);- this.compositeCtx.drawImage(this.temporalAccumulationCanvas!, 0, 0);-- return centerSnapshot ?? lastSnapshot;- }-private compositeWithShadows(): void {if (!this.compositeCanvas || !this.compositeCtx || !this.app) return;@@ -2334,12 +1907,10 @@ export class FrameRenderer {});this.app = null;}- this.zoomBlurFilter?.destroy();- this.motionBlurFilter?.destroy();this.cameraContainer = null;this.videoContainer = null;this.maskGraphics = null;- this.zoomBlurFilter = null;+ this.blurFilter = null;this.motionBlurFilter = null;if (this.cursorOverlay) {this.cursorOverlay.destroy();@@ -2349,16 +1920,11 @@ export class FrameRenderer {this.shadowCtx = null;this.compositeCanvas = null;this.compositeCtx = null;- this.temporalAccumulationCanvas = null;- this.temporalAccumulationCtx = null;this.backgroundCtx = null;this.closeBackgroundDecodedFrame();this.backgroundForwardFrameSource?.cancel();void this.backgroundForwardFrameSource?.destroy();this.backgroundForwardFrameSource = null;- this.backgroundForwardFrameSourceUrl = null;- this.backgroundForwardFrameDurationSec = null;- this.lastSyncedBackgroundLoopTimeSec = null;if (this.backgroundVideoElement) {this.backgroundVideoElement.pause();this.backgroundVideoElement.src = "";diff --git a/src/lib/exporter/gifExporter.ts b/src/lib/exporter/gifExporter.tsindex 904a3827..34b66ad6 100644--- a/src/lib/exporter/gifExporter.ts+++ b/src/lib/exporter/gifExporter.ts@@ -42,9 +42,6 @@ interface GifExporterConfig {shadowIntensity: number;backgroundBlur: number;zoomMotionBlur?: number;- zoomTemporalMotionBlur?: number;- zoomMotionBlurSampleCount?: number | null;- zoomMotionBlurShutterFraction?: number | null;connectZooms?: boolean;zoomInDurationMs?: number;zoomInOverlapMs?: number;@@ -68,9 +65,6 @@ interface GifExporterConfig {cursorStyle?: CursorStyle;cursorSize?: number;cursorSmoothing?: number;- cursorSpringStiffnessMultiplier?: number;- cursorSpringDampingMultiplier?: number;- cursorSpringMassMultiplier?: number;zoomSmoothness?: number;zoomClassicMode?: boolean;cursorMotionBlur?: number;@@ -164,9 +158,6 @@ export class GifExporter {shadowIntensity: this.config.shadowIntensity,backgroundBlur: this.config.backgroundBlur,zoomMotionBlur: this.config.zoomMotionBlur,- zoomTemporalMotionBlur: this.config.zoomTemporalMotionBlur,- zoomMotionBlurSampleCount: this.config.zoomMotionBlurSampleCount,- zoomMotionBlurShutterFraction: this.config.zoomMotionBlurShutterFraction,connectZooms: this.config.connectZooms,zoomInDurationMs: this.config.zoomInDurationMs,zoomInOverlapMs: this.config.zoomInOverlapMs,@@ -194,9 +185,6 @@ export class GifExporter {cursorStyle: this.config.cursorStyle,cursorSize: this.config.cursorSize,cursorSmoothing: this.config.cursorSmoothing,- cursorSpringStiffnessMultiplier: this.config.cursorSpringStiffnessMultiplier,- cursorSpringDampingMultiplier: this.config.cursorSpringDampingMultiplier,- cursorSpringMassMultiplier: this.config.cursorSpringMassMultiplier,zoomSmoothness: this.config.zoomSmoothness,zoomClassicMode: this.config.zoomClassicMode,cursorMotionBlur: this.config.cursorMotionBlur,@@ -244,7 +232,6 @@ export class GifExporter {console.log("[GifExporter] Using streaming decode (web-demuxer + VideoDecoder)");let frameIndex = 0;- const frameDurationUs = 1_000_000 / this.config.frameRate;// Stream decode and process frames — no seeking!await this.streamingDecoder.decodeAll(@@ -263,8 +250,6 @@ export class GifExporter {videoFrame,sourceTimestampUs,cursorTimestampUs,- frameDurationUs,- frameIndex * frameDurationUs,);videoFrame.close();diff --git a/src/lib/exporter/modernFrameRenderer.test.ts b/src/lib/exporter/modernFrameRenderer.test.tsindex d8f28f9e..ccb3374f 100644--- a/src/lib/exporter/modernFrameRenderer.test.ts+++ b/src/lib/exporter/modernFrameRenderer.test.ts@@ -103,7 +103,6 @@ function createMockContext() {return {clearRect: vi.fn(),drawImage: vi.fn(),- fillRect: vi.fn(),save: vi.fn(),restore: vi.fn(),getImageData: vi.fn(() => ({ data: new Uint8ClampedArray(0) })),@@ -171,29 +170,8 @@ describe("ModernFrameRenderer blur export path", () => {beforeEach(() => {Object.assign(globalThis, {window: globalThis,- HTMLMediaElement: {- HAVE_CURRENT_DATA: 2,- },document: {createElement: vi.fn((tag: string) => {- if (tag === "video") {- return {- duration: 5,- readyState: 2,- videoWidth: 1280,- videoHeight: 720,- muted: true,- loop: true,- playsInline: true,- preload: "auto",- src: "",- currentTime: 0,- load: vi.fn(),- pause: vi.fn(),- addEventListener: vi.fn(),- removeEventListener: vi.fn(),- };- }if (tag !== "canvas") {throw new Error(`Unexpected element requested in test: ${tag}`);}@@ -219,7 +197,7 @@ describe("ModernFrameRenderer blur export path", () => {expect(renderer.capturePixelsForNativeExport()).not.toBeNull();});- it("prefers decoder-backed sync for video wallpapers during export", async () => {+ it("prefers decoder-backed video wallpapers during export", async () => {const renderer = new FrameRenderer({width: 1920,height: 1080,diff --git a/src/lib/exporter/modernFrameRenderer.ts b/src/lib/exporter/modernFrameRenderer.tsindex 23f36a02..ee986bf2 100644--- a/src/lib/exporter/modernFrameRenderer.ts+++ b/src/lib/exporter/modernFrameRenderer.ts@@ -1,6 +1,5 @@-import { Application, BlurFilter, Container, Graphics, Rectangle, Sprite, Texture } from "pixi.js";+import { Application, BlurFilter, Container, Graphics, Sprite, Texture } from "pixi.js";import { MotionBlurFilter } from "pixi-filters/motion-blur";-import { ZoomBlurFilter } from "pixi-filters/zoom-blur";import { buildActiveCaptionLayout } from "@/components/video-editor/captionLayout";import {CAPTION_FONT_WEIGHT,@@ -71,10 +70,7 @@ import {} from "@/lib/extensions/renderHooks";import { applyCanvasSceneTransform } from "@/lib/extensions/sceneTransform";import { drawSquircleOnCanvas, drawSquircleOnGraphics } from "@/lib/geometry/squircle";-import {- clampMediaTimeToDuration,- getEffectiveVideoStreamDurationSeconds,-} from "@/lib/mediaTiming";+import { clampMediaTimeToDuration } from "@/lib/mediaTiming";import { isVideoWallpaperSource } from "@/lib/wallpapers";import {type AnnotationRenderAssets,@@ -89,10 +85,6 @@ import {VIDEO_SHADOW_LAYER_PROFILES,WEBCAM_SHADOW_LAYER_PROFILES,} from "./shadowProfile";-import {- buildTemporalSamplePlanUs,- getTemporalMotionBlurConfig,-} from "./temporalMotionBlur";import type { ExportRenderBackend } from "./types";interface FrameRenderConfig {@@ -105,9 +97,6 @@ interface FrameRenderConfig {shadowIntensity: number;backgroundBlur: number;zoomMotionBlur?: number;- zoomTemporalMotionBlur?: number;- zoomMotionBlurSampleCount?: number | null;- zoomMotionBlurShutterFraction?: number | null;connectZooms?: boolean;zoomInDurationMs?: number;zoomInOverlapMs?: number;@@ -135,9 +124,6 @@ interface FrameRenderConfig {cursorStyle?: CursorStyle;cursorSize?: number;cursorSmoothing?: number;- cursorSpringStiffnessMultiplier?: number;- cursorSpringDampingMultiplier?: number;- cursorSpringMassMultiplier?: number;cursorMotionBlur?: number;cursorClickBounce?: number;cursorClickBounceDuration?: number;@@ -231,13 +217,6 @@ interface CaptionRenderState {centerY: number;}-interface RenderSnapshot {- timeMs: number;- cursorTimeMs: number;- sceneTransform: { scale: number; x: number; y: number };- zoom: { scale: number; focusX: number; focusY: number; progress: number };-}-function createAnimationState(): AnimationState {return {scale: 1,@@ -344,20 +323,17 @@ export class FrameRenderer {private backgroundTextureSource: MutableVideoTextureSource | null = null;private videoMaskGraphics: Graphics | null = null;private webcamMaskGraphics: Graphics | null = null;- private zoomBlurFilter: ZoomBlurFilter | null = null;+ private blurFilter: BlurFilter | null = null;private motionBlurFilter: MotionBlurFilter | null = null;private backgroundBlurFilter: BlurFilter | null = null;private annotationAssets: AnnotationRenderAssets | null = null;private annotationScaleFactor = 1;private annotationSprites: AnnotationSpriteEntry[] = [];private backgroundForwardFrameSource: ForwardFrameSource | null = null;- private backgroundForwardFrameSourceUrl: string | null = null;- private backgroundForwardFrameDurationSec: number | null = null;private backgroundDecodedFrame: VideoFrame | null = null;private backgroundVideoElement: HTMLVideoElement | null = null;private backgroundSeekPromise: Promise<void> | null = null;private cleanupBackgroundSource: (() => void) | null = null;- private lastSyncedBackgroundLoopTimeSec: number | null = null;private videoShadowLayers: ShadowLayer[] = [];private webcamShadowLayers: ShadowLayer[] = [];private webcamSprite: Sprite | null = null;@@ -382,7 +358,6 @@ export class FrameRenderer {private captionTextureSource: MutableVideoTextureSource | null = null;private captionRenderKey: string | null = null;private exportCompositeCanvas: ExportCompositeCanvasState | null = null;- private temporalCompositeCanvas: ExportCompositeCanvasState | null = null;private outputCanvasOverride: HTMLCanvasElement | null = null;private config: FrameRenderConfig;private animationState: AnimationState;@@ -427,8 +402,8 @@ export class FrameRenderer {}const activeFilters =- this.shouldUseZoomMotionBlur() && this.zoomBlurFilter && this.motionBlurFilter- ? [this.zoomBlurFilter, this.motionBlurFilter]+ this.shouldUseZoomMotionBlur() && this.motionBlurFilter+ ? [this.motionBlurFilter]: null;this.videoEffectsContainer.filters = activeFilters;}@@ -485,12 +460,6 @@ export class FrameRenderer {this.cameraContainer.addChild(this.videoEffectsContainer);this.cameraContainer.addChild(this.cursorContainer);this.videoEffectsContainer.addChild(this.videoContainer);- this.videoEffectsContainer.filterArea = new Rectangle(- 0,- 0,- this.config.width,- this.config.height,- );this.webcamShadowLayers = this.createShadowLayers(this.webcamRootContainer,@@ -517,11 +486,6 @@ export class FrameRenderer {style: this.config.cursorStyle ?? "tahoe",smoothingFactor:this.config.cursorSmoothing ?? DEFAULT_CURSOR_CONFIG.smoothingFactor,- springTuning: {- stiffnessMultiplier: this.config.cursorSpringStiffnessMultiplier,- dampingMultiplier: this.config.cursorSpringDampingMultiplier,- massMultiplier: this.config.cursorSpringMassMultiplier,- },motionBlur: this.config.cursorMotionBlur ?? 0,clickBounce: this.config.cursorClickBounce ?? DEFAULT_CURSOR_CONFIG.clickBounce,clickBounceDuration:@@ -540,11 +504,6 @@ export class FrameRenderer {await this.setupAnnotationLayer();this.setupCaptionResources();- if (this.shouldUseZoomMotionBlur()) {- this.zoomBlurFilter = new ZoomBlurFilter({ strength: 0 });- this.motionBlurFilter = new MotionBlurFilter([0, 0], 5, 0);- }-this.compositeCanvas = document.createElement("canvas");this.compositeCanvas.width = this.config.width;this.compositeCanvas.height = this.config.height;@@ -557,6 +516,9 @@ export class FrameRenderer {throw new Error("Failed to get 2D context for composite canvas");}+ if (this.shouldUseZoomMotionBlur()) {+ this.motionBlurFilter = new MotionBlurFilter([0, 0], 5, 0);+ }this.updateVideoEffectsFilterState();console.log(`[FrameRenderer] Export renderer backend: ${this.rendererBackend}`);@@ -781,9 +743,7 @@ export class FrameRenderer {const canvas = document.createElement("canvas");canvas.width = targetWidth;canvas.height = targetHeight;- const context = configureHighQuality2DContext(- canvas.getContext("2d", { willReadFrequently: true }),- );+ const context = configureHighQuality2DContext(canvas.getContext("2d"));if (!context) {return null;}@@ -866,12 +826,9 @@ export class FrameRenderer {this.backgroundForwardFrameSource?.cancel();void this.backgroundForwardFrameSource?.destroy();this.backgroundForwardFrameSource = null;- this.backgroundForwardFrameSourceUrl = null;- this.backgroundForwardFrameDurationSec = null;this.closeBackgroundDecodedFrame();this.cleanupBackgroundSource?.();this.cleanupBackgroundSource = null;- this.lastSyncedBackgroundLoopTimeSec = null;if (this.backgroundVideoElement) {this.backgroundVideoElement.pause();@@ -904,18 +861,10 @@ export class FrameRenderer {try {const frameSource = new ForwardFrameSource();- const metadata = await frameSource.initialize(videoSrc);+ await frameSource.initialize(videoSrc);this.backgroundForwardFrameSource = frameSource;- this.backgroundForwardFrameSourceUrl = videoSrc;- this.backgroundForwardFrameDurationSec = getEffectiveVideoStreamDurationSeconds(- {- duration: metadata?.duration,- streamDuration: metadata?.streamDuration,- },- );this.backgroundVideoElement = null;this.backgroundSeekPromise = null;- this.lastSyncedBackgroundLoopTimeSec = null;return;} catch (error) {console.warn(@@ -960,7 +909,6 @@ export class FrameRenderer {});this.backgroundVideoElement = video;- this.lastSyncedBackgroundLoopTimeSec = null;this.ensureBackgroundSprite(video, video.videoWidth, video.videoHeight);return;}@@ -1110,41 +1058,8 @@ export class FrameRenderer {return;}- const resolvedSource =- typeof VideoFrame !== "undefined" && source instanceof VideoFrame- ? this.stageVideoFrameForTexture(source, "background", sourceWidth, sourceHeight)- : typeof HTMLVideoElement !== "undefined" &&- source instanceof HTMLVideoElement &&- sourceWidth > 0 &&- sourceHeight > 0- ? (() => {- const staging = this.ensureVideoFrameStagingCanvas(- "background",- sourceWidth,- sourceHeight,- );- if (!staging) {- return source;- }- staging.context.clearRect(- 0,- 0,- staging.canvas.width,- staging.canvas.height,- );- staging.context.drawImage(- source,- 0,- 0,- staging.canvas.width,- staging.canvas.height,- );- return staging.canvas;- })()- : source;-if (!this.backgroundSprite) {- const texture = this.createTextureFromSource(resolvedSource);+ const texture = this.createTextureFromSource(source);this.backgroundSprite = new Sprite(texture);this.backgroundTextureSource = texture.source as unknown as MutableVideoTextureSource;this.backgroundContainer.addChild(this.backgroundSprite);@@ -1157,7 +1072,7 @@ export class FrameRenderer {this.backgroundSprite.filters = [this.backgroundBlurFilter];}} else if (this.backgroundTextureSource) {- this.backgroundTextureSource.resource = resolvedSource;+ this.backgroundTextureSource.resource = source;this.backgroundTextureSource.update();}@@ -1200,29 +1115,6 @@ export class FrameRenderer {this.backgroundDecodedFrame = null;}- private async restartBackgroundForwardFrameSource(): Promise<void> {- const sourceUrl = this.backgroundForwardFrameSourceUrl;- if (!sourceUrl) {- return;- }-- const nextSource = new ForwardFrameSource();- const metadata = await nextSource.initialize(sourceUrl);- const previousSource = this.backgroundForwardFrameSource;-- this.backgroundForwardFrameSource = nextSource;- const effectiveDuration = getEffectiveVideoStreamDurationSeconds({- duration: metadata?.duration,- streamDuration: metadata?.streamDuration,- });- this.backgroundForwardFrameDurationSec =- Number.isFinite(effectiveDuration) && effectiveDuration > 0 ? effectiveDuration : null;- this.lastSyncedBackgroundLoopTimeSec = null;-- previousSource?.cancel();- void previousSource?.destroy();- }-private calculateAnnotationScaleFactor(): number {const previewWidth = this.config.previewWidth || 1920;const previewHeight = this.config.previewHeight || 1080;@@ -1269,35 +1161,6 @@ export class FrameRenderer {return this.exportCompositeCanvas;}- private ensureTemporalCompositeCanvas(): ExportCompositeCanvasState | null {- const targetWidth = Math.max(1, Math.ceil(this.config.width));- const targetHeight = Math.max(1, Math.ceil(this.config.height));-- if (- this.temporalCompositeCanvas &&- this.temporalCompositeCanvas.canvas.width === targetWidth &&- this.temporalCompositeCanvas.canvas.height === targetHeight- ) {- return this.temporalCompositeCanvas;- }-- const canvas = document.createElement("canvas");- canvas.width = targetWidth;- canvas.height = targetHeight;-- const context = configureHighQuality2DContext(canvas.getContext("2d"));- if (!context) {- return null;- }-- this.temporalCompositeCanvas = {- canvas,- context,- };-- return this.temporalCompositeCanvas;- }-private drawCaptionOverlay(context: CanvasRenderingContext2D): void {if (!this.captionContainer?.visible ||@@ -1318,10 +1181,7 @@ export class FrameRenderer {context.restore();}- private async composeBlurAnnotationFrame(- timeMs: number,- sourceCanvas?: CanvasImageSource,- ): Promise<void> {+ private async composeBlurAnnotationFrame(timeMs: number): Promise<void> {if (!this.app) {this.outputCanvasOverride = null;return;@@ -1335,7 +1195,7 @@ export class FrameRenderer {const { canvas, context } = compositeState;context.clearRect(0, 0, canvas.width, canvas.height);- context.drawImage(sourceCanvas ?? (this.app.canvas as HTMLCanvasElement), 0, 0);+ context.drawImage(this.app.canvas as HTMLCanvasElement, 0, 0);await renderAnnotations(context,@@ -1607,76 +1467,12 @@ export class FrameRenderer {private async syncBackgroundFrame(timeSeconds: number): Promise<void> {if (this.backgroundForwardFrameSource) {- const duration = this.backgroundForwardFrameDurationSec;- const shouldLoop = Number.isFinite(duration) && (duration ?? 0) > 0;- let normalizedTargetTime = shouldLoop- ? ((timeSeconds % duration!) + duration!) % duration!- : Math.max(0, timeSeconds);-- if (- shouldLoop &&- this.lastSyncedBackgroundLoopTimeSec !== null &&- normalizedTargetTime + 0.001 < this.lastSyncedBackgroundLoopTimeSec- ) {- try {- await this.restartBackgroundForwardFrameSource();- } catch (error) {- console.warn(- "[FrameRenderer] Unable to restart looping video wallpaper decoder during export:",- error,- );- }- }-- const decodedFrame =- await this.backgroundForwardFrameSource.getFrameAtTime(normalizedTargetTime);- const resolvedDecodedDuration =- this.backgroundForwardFrameSource.getResolvedDurationSec();- if (- shouldLoop &&- this.backgroundForwardFrameSource.hasReachedEndOfStream() &&- Number.isFinite(resolvedDecodedDuration) &&- (resolvedDecodedDuration ?? 0) > 0 &&- normalizedTargetTime > (resolvedDecodedDuration ?? 0) + 0.001- ) {- this.backgroundForwardFrameDurationSec = resolvedDecodedDuration ?? null;- this.closeBackgroundDecodedFrame();- try {- await this.restartBackgroundForwardFrameSource();- normalizedTargetTime =- ((timeSeconds % resolvedDecodedDuration!) + resolvedDecodedDuration!) %- resolvedDecodedDuration!;- const restartedFrame =- await this.backgroundForwardFrameSource.getFrameAtTime(- normalizedTargetTime,- );- this.backgroundDecodedFrame = restartedFrame;- if (restartedFrame) {- this.lastSyncedBackgroundLoopTimeSec = normalizedTargetTime;- const resolvedBackgroundSource = this.stageVideoFrameForTexture(- restartedFrame,- "background",- restartedFrame.displayWidth,- restartedFrame.displayHeight,- );- this.ensureBackgroundSprite(- resolvedBackgroundSource,- restartedFrame.displayWidth,- restartedFrame.displayHeight,- );- }- return;- } catch (error) {- console.warn(- "[FrameRenderer] Unable to wrap looping video wallpaper at decoded EOF during export:",- error,- );- }- }+ const decodedFrame = await this.backgroundForwardFrameSource.getFrameAtTime(+ Math.max(0, timeSeconds),+ );this.closeBackgroundDecodedFrame();this.backgroundDecodedFrame = decodedFrame;if (decodedFrame) {- this.lastSyncedBackgroundLoopTimeSec = normalizedTargetTime;const resolvedBackgroundSource = this.stageVideoFrameForTexture(decodedFrame,"background",@@ -2459,15 +2255,12 @@ export class FrameRenderer {}}- private async renderSceneSample(+ async renderFrame(+ videoFrame: VideoFrame,timestamp: number,- cursorTimestamp: number,- backgroundTimelineTimestamp: number,- layoutCache: LayoutCache,- useVelocityMotionBlur: boolean,- includeOverlayLayers = true,- ): Promise<RenderSnapshot> {- if (!this.app || !this.cameraContainer || !this.videoMaskGraphics) {+ cursorTimestamp = timestamp,+ ): Promise<void> {+ if (!this.app || !this.videoContainer || !this.cameraContainer || !this.videoMaskGraphics) {throw new Error("Renderer not initialized");}@@ -2478,188 +2271,9 @@ export class FrameRenderer {}if (this.backgroundForwardFrameSource || this.backgroundVideoElement) {- await this.syncBackgroundFrame(Math.max(0, backgroundTimelineTimestamp / 1_000_000));- }-- const timeMs = this.currentVideoTime * 1000;- const cursorTimeMs = cursorTimestamp / 1000;-- if (this.cursorOverlay) {- this.cursorOverlay.update(- this.config.cursorTelemetry ?? [],- cursorTimeMs,- layoutCache.maskRect,- this.config.showCursor ?? true,- false,- );+ await this.syncBackgroundFrame(this.currentVideoTime);}- const motionIntensity = this.updateAnimationState(timeMs);-- applyZoomTransform({- cameraContainer: this.cameraContainer,- zoomBlurFilter: this.zoomBlurFilter,- motionBlurFilter: this.motionBlurFilter,- stageSize: layoutCache.stageSize,- baseMask: layoutCache.maskRect,- zoomScale: this.animationState.scale,- zoomProgress: this.animationState.progress,- focusX: this.animationState.focusX,- focusY: this.animationState.focusY,- motionIntensity,- motionVector: this.lastMotionVector,- isPlaying: true,- motionBlurAmount: useVelocityMotionBlur ? (this.config.zoomMotionBlur ?? 0) : 0,- transformOverride: {- scale: this.animationState.appliedScale,- x: this.animationState.x,- y: this.animationState.y,- },- motionBlurState: this.motionBlurState,- frameTimeMs: timeMs,- });-- if (includeOverlayLayers) {- this.updateAnnotationLayer(timeMs);- this.updateCaptionLayer(timeMs);- }- this.updateWebcamOverlay();-- const annotationContainerVisible = this.annotationContainer?.visible ?? true;- const captionContainerVisible = this.captionContainer?.visible ?? true;- if (!includeOverlayLayers) {- if (this.annotationContainer) {- this.annotationContainer.visible = false;- }- if (this.captionContainer) {- this.captionContainer.visible = false;- }- }-- this.app.render();-- if (!includeOverlayLayers) {- if (this.annotationContainer) {- this.annotationContainer.visible = annotationContainerVisible;- }- if (this.captionContainer) {- this.captionContainer.visible = captionContainerVisible;- }- }-- return {- timeMs,- cursorTimeMs,- sceneTransform: {- scale: this.animationState.appliedScale,- x: this.animationState.x,- y: this.animationState.y,- },- zoom: {- scale: this.animationState.scale,- focusX: this.animationState.focusX,- focusY: this.animationState.focusY,- progress: this.animationState.progress,- },- };- }-- private async renderTemporalMotionBlurFrame(- timestamp: number,- cursorTimestamp: number,- backgroundTimelineTimestamp: number,- frameDurationUs: number,- layoutCache: LayoutCache,- ): Promise<RenderSnapshot | null> {- if (!this.app) {- return null;- }-- const blurConfig = getTemporalMotionBlurConfig(- this.config.zoomTemporalMotionBlur ?? this.config.zoomMotionBlur,- {- sampleCount: this.config.zoomMotionBlurSampleCount,- shutterFraction: this.config.zoomMotionBlurShutterFraction,- },- );- if (!blurConfig) {- return null;- }-- const compositeState = this.ensureTemporalCompositeCanvas();- if (!compositeState) {- return null;- }-- const samplePlan = buildTemporalSamplePlanUs(frameDurationUs, blurConfig);-- compositeState.context.clearRect(- 0,- 0,- compositeState.canvas.width,- compositeState.canvas.height,- );-- let centerSnapshot: RenderSnapshot | null = null;- let lastSnapshot: RenderSnapshot | null = null;-- for (const { offsetUs: sampleOffsetUs, weight } of samplePlan) {- const sampleTimestamp = Math.max(0, timestamp + sampleOffsetUs);- const sampleCursorTimestamp = Math.max(0, cursorTimestamp + sampleOffsetUs);- const sampleBackgroundTimelineTimestamp = Math.max(- 0,- backgroundTimelineTimestamp + sampleOffsetUs,- );- const snapshot = await this.renderSceneSample(- sampleTimestamp,- sampleCursorTimestamp,- sampleBackgroundTimelineTimestamp,- layoutCache,- false,- false,- );- lastSnapshot = snapshot;- if (Math.abs(sampleOffsetUs) < 0.0001) {- centerSnapshot = snapshot;- }-- compositeState.context.save();- compositeState.context.globalCompositeOperation = "lighter";- compositeState.context.globalAlpha = weight;- compositeState.context.drawImage(this.app.canvas as HTMLCanvasElement, 0, 0);- compositeState.context.restore();- }-- const resolvedSnapshot = centerSnapshot ?? lastSnapshot;- if (!resolvedSnapshot) {- return null;- }-- const hasOverlayCanvasWork =- (this.config.annotationRegions?.length ?? 0) > 0 ||- Boolean(this.captionCanvas && this.captionSprite?.visible);- if (hasOverlayCanvasWork) {- await this.composeBlurAnnotationFrame(resolvedSnapshot.timeMs, compositeState.canvas);- } else {- this.outputCanvasOverride = compositeState.canvas;- }-- return resolvedSnapshot;- }-- async renderFrame(- videoFrame: VideoFrame,- timestamp: number,- cursorTimestamp = timestamp,- frameDurationUs?: number,- backgroundTimelineTimestamp = timestamp,- ): Promise<void> {- if (!this.app || !this.videoContainer || !this.cameraContainer || !this.videoMaskGraphics) {- throw new Error("Renderer not initialized");- }-- this.currentVideoTime = timestamp / 1_000_000;-const resolvedVideoSource = this.stageVideoFrameForTexture(videoFrame,"scene",@@ -2693,39 +2307,6 @@ export class FrameRenderer {throw new Error("Renderer layout cache is unavailable");}- const temporalSnapshot =- typeof frameDurationUs === "number" && frameDurationUs > 0- ? await this.renderTemporalMotionBlurFrame(- timestamp,- cursorTimestamp,- backgroundTimelineTimestamp,- frameDurationUs,- layoutCache,- )- : null;-- if (temporalSnapshot) {- const sourceCanvas =- this.outputCanvasOverride ?? this.ensureTemporalCompositeCanvas()?.canvas;- if (sourceCanvas && this.shouldCompositeExtensionFrame()) {- this.compositeExtensions(- temporalSnapshot.timeMs,- temporalSnapshot.cursorTimeMs,- sourceCanvas,- );- this.outputCanvasOverride = this.compositeCanvas;- }- return;- }-- if (this.webcamForwardFrameSource || this.webcamVideoElement) {- await this.syncWebcamFrame(Math.max(0, this.currentVideoTime));- }-- if (this.backgroundForwardFrameSource || this.backgroundVideoElement) {- await this.syncBackgroundFrame(Math.max(0, backgroundTimelineTimestamp / 1_000_000));- }-const timeMs = this.currentVideoTime * 1000;const cursorTimeMs = cursorTimestamp / 1000;@@ -2745,7 +2326,7 @@ export class FrameRenderer {applyZoomTransform({cameraContainer: this.cameraContainer,- zoomBlurFilter: this.zoomBlurFilter,+ blurFilter: this.blurFilter,motionBlurFilter: this.motionBlurFilter,stageSize: layoutCache.stageSize,baseMask: layoutCache.maskRect,@@ -2809,11 +2390,7 @@ export class FrameRenderer {);}- private compositeExtensions(- timeMs: number,- cursorTimeMs: number,- sourceCanvas?: CanvasImageSource,- ): void {+ private compositeExtensions(timeMs: number, cursorTimeMs: number): void {if (!this.app || !this.compositeCtx || !this.compositeCanvas) {return;}@@ -2823,7 +2400,7 @@ export class FrameRenderer {}this.compositeCtx.clearRect(0, 0, this.config.width, this.config.height);- this.compositeCtx.drawImage(sourceCanvas ?? (this.app.canvas as HTMLCanvasElement), 0, 0);+ this.compositeCtx.drawImage(this.app.canvas as HTMLCanvasElement, 0, 0);const maskRect = this.layoutCache?.maskRect;const smoothedCursor = mapSmoothedCursorToCanvasNormalized(@@ -3124,8 +2701,6 @@ export class FrameRenderer {timeMs,{connectZooms: this.config.connectZooms,- zoomInDurationMs: this.config.zoomInDurationMs,- zoomOutDurationMs: this.config.zoomOutDurationMs,},);@@ -3350,7 +2925,7 @@ export class FrameRenderer {if (this.backgroundSprite) {this.backgroundSprite.filters = null;}- this.zoomBlurFilter?.destroy();+ this.blurFilter?.destroy();this.motionBlurFilter?.destroy();this.backgroundBlurFilter?.destroy();@@ -3385,7 +2960,7 @@ export class FrameRenderer {this.backgroundTextureSource = null;this.videoMaskGraphics = null;this.webcamMaskGraphics = null;- this.zoomBlurFilter = null;+ this.blurFilter = null;this.motionBlurFilter = null;this.backgroundBlurFilter = null;this.annotationAssets = null;@@ -3399,9 +2974,6 @@ export class FrameRenderer {this.backgroundForwardFrameSource?.cancel();void this.backgroundForwardFrameSource?.destroy();this.backgroundForwardFrameSource = null;- this.backgroundForwardFrameSourceUrl = null;- this.backgroundForwardFrameDurationSec = null;- this.lastSyncedBackgroundLoopTimeSec = null;if (this.backgroundVideoElement) {this.backgroundVideoElement.pause();this.backgroundVideoElement.src = "";@@ -3438,7 +3010,6 @@ export class FrameRenderer {this.captionTextureSource = null;this.captionRenderKey = null;this.exportCompositeCanvas = null;- this.temporalCompositeCanvas = null;this.outputCanvasOverride = null;this.annotationScaleFactor = 1;diff --git a/src/lib/exporter/modernVideoExporter.ts b/src/lib/exporter/modernVideoExporter.tsindex aabbbea0..229351bd 100644--- a/src/lib/exporter/modernVideoExporter.ts+++ b/src/lib/exporter/modernVideoExporter.ts@@ -59,9 +59,6 @@ interface VideoExporterConfig extends ExportConfig {shadowIntensity: number;backgroundBlur: number;zoomMotionBlur?: number;- zoomTemporalMotionBlur?: number;- zoomMotionBlurSampleCount?: number | null;- zoomMotionBlurShutterFraction?: number | null;connectZooms?: boolean;zoomInDurationMs?: number;zoomInOverlapMs?: number;@@ -85,9 +82,6 @@ interface VideoExporterConfig extends ExportConfig {cursorStyle?: CursorStyle;cursorSize?: number;cursorSmoothing?: number;- cursorSpringStiffnessMultiplier?: number;- cursorSpringDampingMultiplier?: number;- cursorSpringMassMultiplier?: number;cursorMotionBlur?: number;cursorClickBounce?: number;cursorClickBounceDuration?: number;@@ -152,7 +146,6 @@ export class ModernVideoExporter {private encoderName: string | null = null;private backpressureProfile: ExportBackpressureProfile | null = null;private nativeExportSessionId: string | null = null;- private nativePendingWrite: Promise<void> = Promise.resolve();private nativeWritePromises = new Set<Promise<void>>();private nativeWriteError: Error | null = null;private maxNativeWriteInFlight = 1;@@ -309,9 +302,6 @@ export class ModernVideoExporter {shadowIntensity: this.config.shadowIntensity,backgroundBlur: this.config.backgroundBlur,zoomMotionBlur: this.config.zoomMotionBlur,- zoomTemporalMotionBlur: this.config.zoomTemporalMotionBlur,- zoomMotionBlurSampleCount: this.config.zoomMotionBlurSampleCount,- zoomMotionBlurShutterFraction: this.config.zoomMotionBlurShutterFraction,connectZooms: this.config.connectZooms,zoomInDurationMs: this.config.zoomInDurationMs,zoomInOverlapMs: this.config.zoomInOverlapMs,@@ -339,9 +329,6 @@ export class ModernVideoExporter {cursorStyle: this.config.cursorStyle,cursorSize: this.config.cursorSize,cursorSmoothing: this.config.cursorSmoothing,- cursorSpringStiffnessMultiplier: this.config.cursorSpringStiffnessMultiplier,- cursorSpringDampingMultiplier: this.config.cursorSpringDampingMultiplier,- cursorSpringMassMultiplier: this.config.cursorSpringMassMultiplier,cursorMotionBlur: this.config.cursorMotionBlur,cursorClickBounce: this.config.cursorClickBounce,cursorClickBounceDuration: this.config.cursorClickBounceDuration,@@ -395,8 +382,6 @@ export class ModernVideoExporter {videoFrame,sourceTimestampUs,cursorTimestampUs,- frameDuration,- timestamp,);this.renderFrameTimeMs += this.getNowMs() - renderStartedAt;videoFrame.close();@@ -939,7 +924,6 @@ export class ModernVideoExporter {this.lastNativeExportError = null;this.encodeBackend = "ffmpeg";this.encoderName = "h264-stream-copy";- this.nativePendingWrite = Promise.resolve();const sessionId = result.sessionId;const encoder = new VideoEncoder({@@ -950,13 +934,8 @@ export class ModernVideoExporter {const buffer = new ArrayBuffer(chunk.byteLength);chunk.copyTo(buffer);- const writePromise = this.nativePendingWrite- .then(() =>- window.electronAPI.nativeVideoExportWriteFrame(- sessionId,- new Uint8Array(buffer),- ),- )+ const writePromise = window.electronAPI+ .nativeVideoExportWriteFrame(sessionId, new Uint8Array(buffer)).then((writeResult) => {if (!writeResult.success && !this.cancelled) {throw new Error(@@ -978,7 +957,6 @@ export class ModernVideoExporter {}throw error;});- this.nativePendingWrite = writePromise;this.trackNativeWritePromise(writePromise);},@@ -1129,7 +1107,6 @@ export class ModernVideoExporter {this.finalizationStageMs.ffmpegAudioMuxBreakdown = result.metrics;}this.nativeExportSessionId = null;- this.nativePendingWrite = Promise.resolve();if (!result.success) {return {@@ -1822,7 +1799,6 @@ export class ModernVideoExporter {this.lastProgressSampleTimeMs = 0;this.lastProgressSampleFrame = 0;this.nativeWritePromises = new Set();- this.nativePendingWrite = Promise.resolve();this.nativeWriteError = null;this.maxNativeWriteInFlight = 1;this.videoDescription = undefined;diff --git a/src/lib/exporter/temporalMotionBlur.test.ts b/src/lib/exporter/temporalMotionBlur.test.tsdeleted file mode 100644index 0ea1e30e..00000000--- a/src/lib/exporter/temporalMotionBlur.test.ts+++ /dev/null@@ -1,79 +0,0 @@-import { describe, expect, it } from "vitest";-import {- buildTemporalSampleOffsetsUs,- buildTemporalSamplePlanUs,- getTemporalMotionBlurConfig,-} from "./temporalMotionBlur";--describe("temporalMotionBlur", () => {- it("disables temporal blur for zero strength", () => {- expect(getTemporalMotionBlurConfig(0)).toBeNull();- expect(getTemporalMotionBlurConfig(undefined)).toBeNull();- });-- it("uses an odd number of centered samples", () => {- const config = getTemporalMotionBlurConfig(1);-- expect(config).not.toBeNull();- expect(config?.sampleCount).toBe(5);- expect(config?.sampleCount % 2).toBe(1);- expect(config?.shutterFraction).toBeGreaterThan(0.24);- });-- it("caps the automatic sample budget to keep exports responsive", () => {- const config = getTemporalMotionBlurConfig(2);-- expect(config).not.toBeNull();- expect(config?.sampleCount).toBe(5);- });-- it("builds symmetric shutter offsets around the frame center", () => {- const offsets = buildTemporalSampleOffsetsUs(33_333.333, {- sampleCount: 5,- shutterFraction: 0.9,- });-- expect(offsets).toHaveLength(5);- expect(offsets[2]).toBeCloseTo(0, 6);- expect(offsets[0]).toBeCloseTo(-offsets[4], 6);- expect(offsets[1]).toBeCloseTo(-offsets[3], 6);- });-- it("accepts explicit shutter and odd sample overrides", () => {- const config = getTemporalMotionBlurConfig(0.35, {- sampleCount: 60,- shutterFraction: 3,- });-- expect(config).not.toBeNull();- expect(config?.sampleCount).toBe(61);- expect(config?.shutterFraction).toBeCloseTo(3, 6);- });-- it("allows experimental multi-frame shutter windows", () => {- const offsets = buildTemporalSampleOffsetsUs(33_333.333, {- sampleCount: 61,- shutterFraction: 3,- });-- expect(offsets).toHaveLength(61);- expect(offsets[30]).toBeCloseTo(0, 6);- expect(offsets[0]).toBeCloseTo(-50_000, 0);- expect(offsets[60]).toBeCloseTo(50_000, 0);- });-- it("builds normalized sample weights with a center bias", () => {- const config = getTemporalMotionBlurConfig(1.2);- expect(config).not.toBeNull();-- const plan = buildTemporalSamplePlanUs(33_333.333, config!);- const totalWeight = plan.reduce((sum, sample) => sum + sample.weight, 0);- const centerSample = plan[Math.floor(plan.length / 2)];- const edgeSample = plan[0];-- expect(totalWeight).toBeCloseTo(1, 6);- expect(centerSample?.weight ?? 0).toBeGreaterThan(edgeSample?.weight ?? 0);- expect(plan.map((sample) => sample.offsetUs)).toContain(0);- });--});diff --git a/src/lib/exporter/temporalMotionBlur.ts b/src/lib/exporter/temporalMotionBlur.tsdeleted file mode 100644index 69ec5e24..00000000--- a/src/lib/exporter/temporalMotionBlur.ts+++ /dev/null@@ -1,134 +0,0 @@-interface TemporalMotionBlurConfig {- sampleCount: number;- shutterFraction: number;- weightCurvePower: number;-}--interface TemporalMotionBlurOverrides {- sampleCount?: number | null;- shutterFraction?: number | null;-}--interface TemporalMotionBlurSample {- offsetUs: number;- weight: number;-}--const MIN_BLUR_AMOUNT = 0.001;-export const TEMPORAL_MOTION_BLUR_MIN_SHUTTER_FRACTION = 0.18;-export const TEMPORAL_MOTION_BLUR_MAX_SHUTTER_FRACTION = 3;-export const TEMPORAL_MOTION_BLUR_MIN_SAMPLE_COUNT = 3;-export const TEMPORAL_MOTION_BLUR_MAX_SAMPLE_COUNT = 61;-export const TEMPORAL_MOTION_BLUR_DEFAULT_SAMPLE_COUNT = 13;-export const TEMPORAL_MOTION_BLUR_DEFAULT_SHUTTER_FRACTION = 0.94;-const TEMPORAL_MOTION_BLUR_AUTO_MIN_SHUTTER_FRACTION = 0.24;-const TEMPORAL_MOTION_BLUR_AUTO_MAX_SHUTTER_FRACTION = 0.62;-const TEMPORAL_MOTION_BLUR_AUTO_MAX_SAMPLE_COUNT = 5;-const TEMPORAL_MOTION_BLUR_WEIGHT_FLOOR = 0.22;-const MAX_BLUR_AMOUNT = 2;--function normalizeTemporalMotionBlurSampleCount(value: number | null | undefined): number | null {- if (!Number.isFinite(value)) {- return null;- }-- const roundedValue = Math.round(value ?? 0);- const clampedValue = Math.min(- TEMPORAL_MOTION_BLUR_MAX_SAMPLE_COUNT,- Math.max(TEMPORAL_MOTION_BLUR_MIN_SAMPLE_COUNT, roundedValue),- );-- if (clampedValue % 2 === 1) {- return clampedValue;- }-- return clampedValue >= TEMPORAL_MOTION_BLUR_MAX_SAMPLE_COUNT- ? clampedValue - 1- : clampedValue + 1;-}--export function getTemporalMotionBlurConfig(- amount: number | null | undefined,- overrides: TemporalMotionBlurOverrides = {},-): TemporalMotionBlurConfig | null {- const resolvedAmount = Number.isFinite(amount) ? Math.max(0, amount ?? 0) : 0;- if (resolvedAmount < MIN_BLUR_AMOUNT) {- return null;- }-- const normalizedAmount = Math.min(1, resolvedAmount / MAX_BLUR_AMOUNT);- const sampleStepCount = Math.round(- normalizedAmount *- ((TEMPORAL_MOTION_BLUR_AUTO_MAX_SAMPLE_COUNT - TEMPORAL_MOTION_BLUR_MIN_SAMPLE_COUNT) /- 2),- );- const defaultSampleCount = TEMPORAL_MOTION_BLUR_MIN_SAMPLE_COUNT + sampleStepCount * 2;- const sampleCount =- normalizeTemporalMotionBlurSampleCount(overrides.sampleCount) ?? defaultSampleCount;- const shutterFraction = Number.isFinite(overrides.shutterFraction)- ? Math.min(- TEMPORAL_MOTION_BLUR_MAX_SHUTTER_FRACTION,- Math.max(- TEMPORAL_MOTION_BLUR_MIN_SHUTTER_FRACTION,- overrides.shutterFraction ?? TEMPORAL_MOTION_BLUR_AUTO_MIN_SHUTTER_FRACTION,- ),- )- : TEMPORAL_MOTION_BLUR_AUTO_MIN_SHUTTER_FRACTION +- normalizedAmount *- (TEMPORAL_MOTION_BLUR_AUTO_MAX_SHUTTER_FRACTION -- TEMPORAL_MOTION_BLUR_AUTO_MIN_SHUTTER_FRACTION);-- return {- sampleCount,- shutterFraction,- weightCurvePower: 1.2 + normalizedAmount * 0.9,- };-}--export function buildTemporalSampleOffsetsUs(- frameDurationUs: number,- config: TemporalMotionBlurConfig,-): number[] {- const safeFrameDurationUs = Math.max(1, frameDurationUs);- const safeSampleCount = Math.max(1, Math.floor(config.sampleCount));- if (safeSampleCount === 1) {- return [0];- }-- const shutterWindowUs =- safeFrameDurationUs *- Math.max(0, Math.min(TEMPORAL_MOTION_BLUR_MAX_SHUTTER_FRACTION, config.shutterFraction));- const startOffsetUs = -shutterWindowUs / 2;- const stepUs = shutterWindowUs / (safeSampleCount - 1);-- return Array.from({ length: safeSampleCount }, (_, index) => startOffsetUs + stepUs * index);-}--export function buildTemporalSamplePlanUs(- frameDurationUs: number,- config: TemporalMotionBlurConfig,-): TemporalMotionBlurSample[] {- const offsetsUs = buildTemporalSampleOffsetsUs(frameDurationUs, config);- if (offsetsUs.length === 1) {- return [{ offsetUs: 0, weight: 1 }];- }-- const centerIndex = (offsetsUs.length - 1) / 2;- const rawWeights = offsetsUs.map((_offsetUs, index) => {- const normalizedDistance = Math.abs(index - centerIndex) / Math.max(1, centerIndex);- const taperedWeight = Math.cos(normalizedDistance * (Math.PI / 2));- return (- TEMPORAL_MOTION_BLUR_WEIGHT_FLOOR +- (1 - TEMPORAL_MOTION_BLUR_WEIGHT_FLOOR) *- Math.pow(Math.max(0, taperedWeight), config.weightCurvePower)- );- });- const totalWeight = rawWeights.reduce((sum, weight) => sum + weight, 0) || 1;-- return offsetsUs.map((offsetUs, index) => ({- offsetUs,- weight: rawWeights[index]! / totalWeight,- }));-}--export type { TemporalMotionBlurConfig, TemporalMotionBlurOverrides, TemporalMotionBlurSample };diff --git a/src/lib/exporter/videoExporter.ts b/src/lib/exporter/videoExporter.tsindex 47926eb7..f8581910 100644--- a/src/lib/exporter/videoExporter.ts+++ b/src/lib/exporter/videoExporter.ts@@ -48,9 +48,6 @@ interface VideoExporterConfig extends ExportConfig {shadowIntensity: number;backgroundBlur: number;zoomMotionBlur?: number;- zoomTemporalMotionBlur?: number;- zoomMotionBlurSampleCount?: number | null;- zoomMotionBlurShutterFraction?: number | null;connectZooms?: boolean;zoomInDurationMs?: number;zoomInOverlapMs?: number;@@ -74,9 +71,6 @@ interface VideoExporterConfig extends ExportConfig {cursorStyle?: CursorStyle;cursorSize?: number;cursorSmoothing?: number;- cursorSpringStiffnessMultiplier?: number;- cursorSpringDampingMultiplier?: number;- cursorSpringMassMultiplier?: number;cursorMotionBlur?: number;cursorClickBounce?: number;cursorClickBounceDuration?: number;@@ -198,9 +192,6 @@ export class VideoExporter {shadowIntensity: this.config.shadowIntensity,backgroundBlur: this.config.backgroundBlur,zoomMotionBlur: this.config.zoomMotionBlur,- zoomTemporalMotionBlur: this.config.zoomTemporalMotionBlur,- zoomMotionBlurSampleCount: this.config.zoomMotionBlurSampleCount,- zoomMotionBlurShutterFraction: this.config.zoomMotionBlurShutterFraction,connectZooms: this.config.connectZooms,zoomInDurationMs: this.config.zoomInDurationMs,zoomInOverlapMs: this.config.zoomInOverlapMs,@@ -228,9 +219,6 @@ export class VideoExporter {cursorStyle: this.config.cursorStyle,cursorSize: this.config.cursorSize,cursorSmoothing: this.config.cursorSmoothing,- cursorSpringStiffnessMultiplier: this.config.cursorSpringStiffnessMultiplier,- cursorSpringDampingMultiplier: this.config.cursorSpringDampingMultiplier,- cursorSpringMassMultiplier: this.config.cursorSpringMassMultiplier,cursorMotionBlur: this.config.cursorMotionBlur,cursorClickBounce: this.config.cursorClickBounce,cursorClickBounceDuration: this.config.cursorClickBounceDuration,@@ -286,8 +274,6 @@ export class VideoExporter {videoFrame,sourceTimestampUs,cursorTimestampUs,- frameDuration,- timestamp,);videoFrame.close();diff --git a/src/lib/shortcuts.ts b/src/lib/shortcuts.tsindex d2d9828c..f1bc84b4 100644--- a/src/lib/shortcuts.ts+++ b/src/lib/shortcuts.ts@@ -1,6 +1,8 @@export const SHORTCUT_ACTIONS = ["addZoom",+ "addTrim","splitClip",+ "addSpeed","addAnnotation","addKeyframe","deleteSelected",@@ -74,7 +76,9 @@ export function findConflict(export const DEFAULT_SHORTCUTS: ShortcutsConfig = {addZoom: { key: "z" },+ addTrim: { key: "t" },splitClip: { key: "c" },+ addSpeed: { key: "s" },addAnnotation: { key: "a" },addKeyframe: { key: "f" },deleteSelected: { key: "d", ctrl: true },@@ -83,7 +87,9 @@ export const DEFAULT_SHORTCUTS: ShortcutsConfig = {export const SHORTCUT_LABELS: Record<ShortcutAction, string> = {addZoom: "Add Zoom",+ addTrim: "Add Trim",splitClip: "Split Clip",+ addSpeed: "Add Speed",addAnnotation: "Add Annotation",addKeyframe: "Add Keyframe",deleteSelected: "Delete Selected",