The swiss army knife of lossless video/audio editing
simplify and remove option
Mikael Finstad260530d02ea6
diff --git a/src/common/types.ts b/src/common/types.tsindex aca57f3d..9295ba1b 100644--- a/src/common/types.ts+++ b/src/common/types.ts@@ -50,7 +50,6 @@ export interface Config {preserveChapters: boolean,preserveMetadata: PreserveMetadata,preserveMetadataOnMerge: boolean,- keepOriginalChaptersOnMerge: boolean,preserveMovData: boolean,movFastStart: boolean,avoidNegativeTs: AvoidNegativeTs,diff --git a/src/main/configStore.ts b/src/main/configStore.tsindex 5e5a9ba1..58a495de 100644--- a/src/main/configStore.ts+++ b/src/main/configStore.ts@@ -122,7 +122,6 @@ const defaults: Config = {preserveChapters: true,preserveMetadata: 'default',preserveMetadataOnMerge: false,- keepOriginalChaptersOnMerge: false,preserveMovData: false,movFastStart: true,avoidNegativeTs: 'make_zero',diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsxindex d7622f5b..2cd1a0df 100644--- a/src/renderer/src/App.tsx+++ b/src/renderer/src/App.tsx@@ -59,7 +59,7 @@ import {readFileFfprobeMeta, getDefaultOutFormat,setCustomFfPath as ffmpegSetCustomFfPath,isIphoneHevc, isProblematicAvc1, tryMapChaptersToEdl,- getTimecodeFromStreams, createChaptersFromSegments, createChaptersFromOriginalFiles,+ getTimecodeFromStreams, createChaptersFromSegments,RefuseOverwriteError, extractSubtitleTrackToSegments,mapRecommendedDefaultFormat,getFfCommandLine,@@ -188,7 +188,7 @@ function App() {const [selectedBatchFiles, setSelectedBatchFiles] = useState<string[]>([]);const allUserSettings = useUserSettingsRoot();- const { captureFormat, keyframeCut, preserveMetadata, preserveMetadataOnMerge, keepOriginalChaptersOnMerge, preserveMovData, preserveChapters, movFastStart, avoidNegativeTs, autoMerge, timecodeFormat, invertCutSegments, autoExportExtraStreams, askBeforeClose, enableImportChapters, enableAskForFileOpenAction, playbackVolume, autoSaveProjectFile, wheelSensitivity, waveformHeight, invertTimelineScroll, language, ffmpegExperimental, hideNotifications, hideOsNotifications, autoLoadTimecode, autoDeleteMergedSegments, exportConfirmEnabled, segmentsToChapters, simpleMode, cutFileTemplate, cutMergedFileTemplate, mergedFileTemplate, keyboardSeekAccFactor, keyboardNormalSeekSpeed, keyboardSeekSpeed2, keyboardSeekSpeed3, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart, outFormatLocked, safeOutputFileName, enableAutoHtml5ify, segmentsToChaptersOnly, keyBindings, enableSmartCut, customFfPath, storeProjectInWorkingDir, enableOverwriteOutput, mouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, captureFrameMethod, captureFrameQuality, captureFrameFileNameFormat, enableNativeHevc, cleanupChoices, darkMode, preferStrongColors, outputFileNameMinZeroPadding, cutFromAdjustmentFrames, cutToAdjustmentFrames, waveformMode: waveformModePreference, thumbnailsEnabled, keyframesEnabled, reducedMotion, ffmpegHwaccel } = allUserSettings.settings;+ const { captureFormat, keyframeCut, preserveMetadata, preserveMetadataOnMerge, preserveMovData, preserveChapters, movFastStart, avoidNegativeTs, autoMerge, timecodeFormat, invertCutSegments, autoExportExtraStreams, askBeforeClose, enableImportChapters, enableAskForFileOpenAction, playbackVolume, autoSaveProjectFile, wheelSensitivity, waveformHeight, invertTimelineScroll, language, ffmpegExperimental, hideNotifications, hideOsNotifications, autoLoadTimecode, autoDeleteMergedSegments, exportConfirmEnabled, segmentsToChapters, simpleMode, cutFileTemplate, cutMergedFileTemplate, mergedFileTemplate, keyboardSeekAccFactor, keyboardNormalSeekSpeed, keyboardSeekSpeed2, keyboardSeekSpeed3, treatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart, outFormatLocked, safeOutputFileName, enableAutoHtml5ify, segmentsToChaptersOnly, keyBindings, enableSmartCut, customFfPath, storeProjectInWorkingDir, enableOverwriteOutput, mouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, captureFrameMethod, captureFrameQuality, captureFrameFileNameFormat, enableNativeHevc, cleanupChoices, darkMode, preferStrongColors, outputFileNameMinZeroPadding, cutFromAdjustmentFrames, cutToAdjustmentFrames, waveformMode: waveformModePreference, thumbnailsEnabled, keyframesEnabled, reducedMotion, ffmpegHwaccel } = allUserSettings.settings;const { setCaptureFormat, setCustomOutDir, setKeyframeCut, setPlaybackVolume, setExportConfirmEnabled, setSimpleMode, setOutFormatLocked, setSafeOutputFileName, setKeyBindings, resetKeyBindings, setStoreProjectInWorkingDir, setCleanupChoices, toggleDarkMode, setWaveformMode, setThumbnailsEnabled, setKeyframesEnabled, prefersReducedMotion, customOutDir } = allUserSettings;const [showAdvancedSettings, setShowAdvancedSettings] = useState(!simpleMode);@@ -918,13 +918,9 @@ function App() {invariant(fileName != null);const outPath = getOutPath({ customOutDir, filePath: firstPath, fileName });- let chaptersFromSegments: Awaited<ReturnType<typeof createChaptersFromSegments>>;- if (keepOriginalChaptersOnMerge) {- chaptersFromSegments = await createChaptersFromOriginalFiles({ paths, createChapterForFilesWithoutChapters: segmentsToChapters });- } else if (segmentsToChapters) {- const chapterNames = paths.map((path) => parsePath(path).name);- chaptersFromSegments = await createChaptersFromSegments({ segmentPaths: paths, chapterNames });- }+ const chaptersFromSegments = segmentsToChapters+ ? await createChaptersFromSegments({ paths, defaultChapterNames: paths.map((path) => parsePath(path).name), useFileChapters: true })+ : undefined;let inputSize: number;try {@@ -989,7 +985,7 @@ function App() {setWorking(undefined);setProgress(undefined);}- }, [workingRef, ensureWritableOutDir, customOutDir, setWorking, segmentsToChapters, keepOriginalChaptersOnMerge, concatFiles, ffmpegExperimental, preserveMovData, movFastStart, preserveMetadataOnMerge, closeBatch, enableOverwriteOutput, hideAllNotifications, t, showOsNotification, openConcatFinishedDialog, handleConcatFailed]);+ }, [workingRef, ensureWritableOutDir, customOutDir, setWorking, segmentsToChapters, concatFiles, ffmpegExperimental, preserveMovData, movFastStart, preserveMetadataOnMerge, closeBatch, enableOverwriteOutput, hideAllNotifications, t, showOsNotification, openConcatFinishedDialog, handleConcatFailed]);const cleanupFiles = useCallback(async (cleanupChoices2: CleanupChoicesType) => {// Store paths before we reset statediff --git a/src/renderer/src/components/ConcatDialog.tsx b/src/renderer/src/components/ConcatDialog.tsxindex 4251a354..88c7d62b 100644--- a/src/renderer/src/components/ConcatDialog.tsx+++ b/src/renderer/src/components/ConcatDialog.tsx@@ -67,7 +67,7 @@ function ConcatDialog({ isShown, onHide, paths, mergedFileTemplate, generateMergonOutputFormatUserChange: (newFormat: string) => void,}) {const { t } = useTranslation();- const { preserveMovData, setPreserveMovData, segmentsToChapters, setSegmentsToChapters, preserveMetadataOnMerge, setPreserveMetadataOnMerge, keepOriginalChaptersOnMerge, setKeepOriginalChaptersOnMerge, customOutDir, simpleMode, setMergedFileTemplate, outFormatLocked } = useUserSettings();+ const { preserveMovData, setPreserveMovData, segmentsToChapters, setSegmentsToChapters, preserveMetadataOnMerge, setPreserveMetadataOnMerge, customOutDir, simpleMode, setMergedFileTemplate, outFormatLocked } = useUserSettings();const [includeAllStreams, setIncludeAllStreams] = useState(false);const [allFilesMeta, setAllFilesMeta] = useState<Record<string, { ffprobeMeta: FileFfprobeMeta, stats: FileStats }>>({});@@ -358,8 +358,6 @@ function ConcatDialog({ isShown, onHide, paths, mergedFileTemplate, generateMerg<Checkbox checked={segmentsToChapters} onCheckedChange={(checked) => setSegmentsToChapters(checked === true)} label={t('Create chapters from merged segments? (slow)')} />- <Checkbox checked={keepOriginalChaptersOnMerge} onCheckedChange={(checked) => setKeepOriginalChaptersOnMerge(checked === true)} label={t('Keep original chapters')} />-<Checkbox checked={alwaysConcatMultipleFiles} onCheckedChange={(checked) => setAlwaysConcatMultipleFiles(checked === true)} label={t('Always open this dialog when opening multiple files')} /><Checkbox checked={clearBatchFilesAfterConcat} onCheckedChange={(checked) => setClearBatchFilesAfterConcat(checked === true)} label={t('Clear batch file list after merge')} />diff --git a/src/renderer/src/ffmpeg.ts b/src/renderer/src/ffmpeg.tsindex 8aa04540..69d9e880 100644--- a/src/renderer/src/ffmpeg.ts+++ b/src/renderer/src/ffmpeg.ts@@ -14,6 +14,7 @@ import type { FFprobeChapter, FFprobeFormat, FFprobeProbeResult, FFprobeStream }import { parseSrt, parseSrtToSegments } from './edlFormats';import { UnsupportedFileError, UserFacingError } from '../errors';import mainApi from './mainApi';+import { parseFfprobeDuration } from '../../common/util';const { ffmpeg } = window.require('@electron/remote').require('./index.js');@@ -220,22 +221,6 @@ export function tryMapChaptersToEdl(chapters: FFprobeChapter[]) {}}-export async function createChaptersFromSegments({ segmentPaths, chapterNames }: { segmentPaths: string[], chapterNames?: (string | undefined)[] | undefined }) {- if (!chapterNames) return undefined;- try {- const durations = await pMap(segmentPaths, async (segmentPath) => (await getDuration(segmentPath)) ?? 0, { concurrency: 3 });- let timeAt = 0;- return durations.map((duration, i) => {- const ret = { start: timeAt, end: timeAt + duration, name: chapterNames[i] };- timeAt += duration;- return ret;- });- } catch (err) {- console.error('Failed to create chapters from segments', err);- return undefined;- }-}-/*** Some of the detected input formats are not the same as the muxer name used for encoding.* Therefore we have to map between detected input format and encode format@@ -378,35 +363,6 @@ export async function readFileFfprobeMeta(filePath: string) {export type FileFfprobeMeta = Awaited<ReturnType<typeof readFileFfprobeMeta>>;export type FileStream = FileFfprobeMeta['streams'][number];-export async function createChaptersFromOriginalFiles({ paths, createChapterForFilesWithoutChapters }: { paths: string[], createChapterForFilesWithoutChapters: boolean }) {- const { parse } = window.require('path') as { parse: (p: string) => { name: string } };- try {- const mergedChapters: { start: number, end: number, name: string | undefined }[] = [];- let offset = 0;- for (const path of paths) {- const meta = await readFileFfprobeMeta(path);- const duration = (await getDuration(path)) ?? 0;- const chapters = meta.chapters ?? [];- if (chapters.length > 0) {- for (const ch of chapters) {- mergedChapters.push({- start: offset + parseFloat(ch.start_time),- end: offset + parseFloat(ch.end_time),- name: ch.tags?.title ?? undefined,- });- }- } else if (createChapterForFilesWithoutChapters) {- mergedChapters.push({ start: offset, end: offset + duration, name: parse(path).name });- }- offset += duration;- }- return mergedChapters.length > 0 ? mergedChapters : undefined;- } catch (err) {- console.error('Failed to create chapters from original files', err);- return undefined;- }-}-async function renderThumbnail(filePath: string, timestamp: number, signal: AbortSignal) {const args = ['-ss', String(timestamp),@@ -605,3 +561,49 @@ export async function runFfmpegStartupCheck() {export const getExperimentalArgs = (ffmpegExperimental: boolean) => (ffmpegExperimental ? ['-strict', 'experimental'] : []);export const getVideoTimescaleArgs = (videoTimebase: number | undefined) => (videoTimebase != null ? ['-video_track_timescale', String(videoTimebase)] : []);++export async function createChaptersFromSegments({ paths, defaultChapterNames, useFileChapters }: {+ paths: string[],+ defaultChapterNames?: (string | undefined)[] | undefined,+ useFileChapters?: boolean,+}) {+ if (defaultChapterNames == null) return undefined;++ try {+ const filesMeta = await pMap(paths, async (path) => readFileFfprobeMeta(path), { concurrency: 3 });++ let timeAt = 0;++ return filesMeta.flatMap((meta, i) => {+ const duration = parseFfprobeDuration(meta.format.duration) ?? 0;++ try {+ // if the file has chapters, use it (but only when not cutting)+ if (useFileChapters && meta.chapters.length > 0) {+ return meta.chapters.map((ch) => {+ const start = parseFloat(ch.start_time);+ const end = parseFloat(ch.end_time);+ invariant(!Number.isNaN(start) && !Number.isNaN(end));+ return {+ start: timeAt + start,+ end: timeAt + start,+ name: ch.tags.title,+ };+ });+ }++ // if no chapters, or if cutting, then create one chapter for the whole file with the default name+ return [{+ start: timeAt,+ end: timeAt + duration,+ name: defaultChapterNames[i],+ }];+ } finally {+ timeAt += duration;+ }+ });+ } catch (err) {+ console.error('Failed to create chapters', err);+ return undefined;+ }+}diff --git a/src/renderer/src/hooks/useFfmpegOperations.ts b/src/renderer/src/hooks/useFfmpegOperations.tsindex c524e946..3820d169 100644--- a/src/renderer/src/hooks/useFfmpegOperations.ts+++ b/src/renderer/src/hooks/useFfmpegOperations.ts@@ -688,7 +688,7 @@ function useFfmpegOperations({ filePath, treatInputFileModifiedTimeAsStart, treaif (await shouldSkipExistingFile(mergedOutFilePath)) return;- const chapters = await createChaptersFromSegments({ segmentPaths, chapterNames });+ const chapters = await createChaptersFromSegments({ paths: segmentPaths, defaultChapterNames: chapterNames });const metadataFromPath = segmentPaths[0];invariant(metadataFromPath != null);diff --git a/src/renderer/src/hooks/useUserSettingsRoot.ts b/src/renderer/src/hooks/useUserSettingsRoot.tsindex b7fa378d..3be66151 100644--- a/src/renderer/src/hooks/useUserSettingsRoot.ts+++ b/src/renderer/src/hooks/useUserSettingsRoot.ts@@ -64,8 +64,6 @@ export default function useUserSettingsRoot() {useEffect(() => safeSetConfig({ preserveMetadata }), [preserveMetadata]);const [preserveMetadataOnMerge, setPreserveMetadataOnMerge] = useState(safeGetConfigInitial('preserveMetadataOnMerge'));useEffect(() => safeSetConfig({ preserveMetadataOnMerge }), [preserveMetadataOnMerge]);- const [keepOriginalChaptersOnMerge, setKeepOriginalChaptersOnMerge] = useState(safeGetConfigInitial('keepOriginalChaptersOnMerge'));- useEffect(() => safeSetConfig({ keepOriginalChaptersOnMerge }), [keepOriginalChaptersOnMerge]);const [preserveMovData, setPreserveMovData] = useState(safeGetConfigInitial('preserveMovData'));useEffect(() => safeSetConfig({ preserveMovData }), [preserveMovData]);const [preserveChapters, setPreserveChapters] = useState(safeGetConfigInitial('preserveChapters'));@@ -252,7 +250,6 @@ export default function useUserSettingsRoot() {keyframeCut,preserveMetadata,preserveMetadataOnMerge,- keepOriginalChaptersOnMerge,preserveMovData,preserveChapters,movFastStart,@@ -334,7 +331,6 @@ export default function useUserSettingsRoot() {setKeyframeCut,setPreserveMetadata,setPreserveMetadataOnMerge,- setKeepOriginalChaptersOnMerge,setPreserveMovData,setPreserveChapters,setMovFastStart,