The swiss army knife of lossless video/audio editing
fix capture frame timestamp transfer
Mikael Finstad2511176958a6
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsxindex a2d27718..dfadf91a 100644--- a/src/renderer/src/App.tsx+++ b/src/renderer/src/App.tsx@@ -672,7 +672,7 @@ function App() {setUsingDummyVideo(false);}, [setHideCompatPlayer, setPreviewFilePath, setUsingDummyVideo]);- const { captureFrameFromTag, captureFrameFromFfmpeg, captureFrameToClipboard, captureFramesRange } = useFrameCapture({ appendFfmpegCommandLog, formatTimecode, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart });+ const { captureFrameFromTag, captureFrameFromFfmpeg, captureFrameToClipboard, captureFramesRange } = useFrameCapture({ appendFfmpegCommandLog, formatTimecode, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart, fileDuration });const getNewJumpIndex = (oldIndex: number, direction: -1 | 1) => Math.max(oldIndex + direction, 0);diff --git a/src/renderer/src/hooks/useFrameCapture.ts b/src/renderer/src/hooks/useFrameCapture.tsindex d92e68dd..7393629a 100644--- a/src/renderer/src/hooks/useFrameCapture.ts+++ b/src/renderer/src/hooks/useFrameCapture.ts@@ -3,7 +3,7 @@ import pMap from 'p-map';import { useCallback } from 'react';import { getSuffixedOutPath, getOutDir, transferTimestamps, getSuffixedFileName, getOutPath, escapeRegExp, fsOperationWithRetry } from '../util';-import { getNumDigits } from '../segments';+import { getNumDigits, isDurationValid } from '../segments';import * as ffmpeg from '../ffmpeg';import { FormatTimecode } from '../types';@@ -25,11 +25,12 @@ function getFrameFromVideo(video: HTMLVideoElement, format: CaptureFormat, qualireturn dataUriToBuffer(dataUri);}-export default ({ appendFfmpegCommandLog, formatTimecode, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart }: {+export default ({ appendFfmpegCommandLog, formatTimecode, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart, fileDuration }: {appendFfmpegCommandLog: (args: string[]) => void,formatTimecode: FormatTimecode,treatInputFileModifiedTimeAsStart: boolean,- treatOutputFileModifiedTimeAsStart?: boolean | undefined | null,+ treatOutputFileModifiedTimeAsStart: boolean | undefined | null,+ fileDuration: number | undefined,}) => {const captureFramesRange = useCallback(async ({ customOutDir, filePath, fps, fromTime, toTime, estimatedMaxNumFiles, captureFormat, quality, filter, onProgress, outputTimestamps }: {customOutDir: string | undefined,@@ -103,9 +104,9 @@ export default ({ appendFfmpegCommandLog, formatTimecode, treatInputFileModifiedconst args = await ffmpeg.captureFrameToFile({ timestamp: time, videoPath: filePath, outPath, quality });appendFfmpegCommandLog(args);- await transferTimestamps({ inPath: filePath, outPath, cutFrom: time, cutTo: time, duration: 0, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart });+ await transferTimestamps({ inPath: filePath, outPath, cutFrom: time, cutTo: time, duration: isDurationValid(fileDuration) ? fileDuration : undefined, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart });return outPath;- }, [appendFfmpegCommandLog, formatTimecode, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart]);+ }, [appendFfmpegCommandLog, fileDuration, formatTimecode, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart]);const captureFrameFromTag = useCallback(async ({ customOutDir, filePath, time, captureFormat, quality, video }: {customOutDir?: string | undefined,@@ -123,9 +124,9 @@ export default ({ appendFfmpegCommandLog, formatTimecode, treatInputFileModifiedconst outPath = getSuffixedOutPath({ customOutDir, filePath, nameSuffix: `${timecode}.${ext}` });await writeFile(outPath, buf);- await transferTimestamps({ inPath: filePath, outPath, cutFrom: time, cutTo: time, duration: 0, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart });+ await transferTimestamps({ inPath: filePath, outPath, cutFrom: time, cutTo: time, duration: isDurationValid(fileDuration) ? fileDuration : undefined, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart });return outPath;- }, [formatTimecode, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart]);+ }, [fileDuration, formatTimecode, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart]);const captureFrameToClipboard = useCallback(async ({ filePath, time, quality }: {filePath: string,