The swiss army knife of lossless video/audio editing
log ffprobe detected formats
Mikael Finstad91fbc0fa9507
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsxindex a5a247b0..dc0bfeb0 100644--- a/src/renderer/src/App.tsx+++ b/src/renderer/src/App.tsx@@ -53,7 +53,7 @@ import { darkModeTransition } from './colors';import { getSegColor } from './util/colors';import {getStreamFps, isCuttingStart, isCuttingEnd,- readFileMeta, getSmarterOutFormat,+ readFileMeta, getDefaultOutFormat,extractStreams, setCustomFfPath as ffmpegSetCustomFfPath,isIphoneHevc, isProblematicAvc1, tryMapChaptersToEdl,getDuration, getTimecodeFromStreams, createChaptersFromSegments,@@ -1304,7 +1304,7 @@ function App() {const fileMeta = await readFileMeta(fp);// console.log('file meta read', fileMeta);- const fileFormatNew = await getSmarterOutFormat({ filePath: fp, fileMeta });+ const fileFormatNew = await getDefaultOutFormat({ filePath: fp, fileMeta });if (!fileFormatNew) throw new Error('Unable to determine file format');diff --git a/src/renderer/src/components/ConcatDialog.tsx b/src/renderer/src/components/ConcatDialog.tsxindex ce831e5f..6fea86f7 100644--- a/src/renderer/src/components/ConcatDialog.tsx+++ b/src/renderer/src/components/ConcatDialog.tsx@@ -8,7 +8,7 @@ import invariant from 'tiny-invariant';import Checkbox from './Checkbox';import { ReactSwal } from '../swal';-import { readFileMeta, getSmarterOutFormat } from '../ffmpeg';+import { readFileMeta, getDefaultOutFormat } from '../ffmpeg';import useFileFormatState from '../hooks/useFileFormatState';import OutputFormatSelect from './OutputFormatSelect';import useUserSettings from '../hooks/useUserSettings';@@ -66,7 +66,7 @@ function ConcatDialog({ isShown, onHide, paths, onConcat, alwaysConcatMultipleFisetOutFileName(undefined);invariant(firstPath != null);const fileMetaNew = await readFileMeta(firstPath);- const fileFormatNew = await getSmarterOutFormat({ filePath: firstPath, fileMeta: fileMetaNew });+ const fileFormatNew = await getDefaultOutFormat({ filePath: firstPath, fileMeta: fileMetaNew });if (aborted) return;setFileMeta(fileMetaNew);setFileFormat(fileFormatNew);diff --git a/src/renderer/src/ffmpeg.ts b/src/renderer/src/ffmpeg.tsindex bbe079b8..96140c38 100644--- a/src/renderer/src/ffmpeg.ts+++ b/src/renderer/src/ffmpeg.ts@@ -260,10 +260,12 @@ function mapDefaultFormat({ streams, requestedFormat }: { streams: FFprobeStreamasync function determineOutputFormat(ffprobeFormatsStr: string | undefined, filePath: string) {const ffprobeFormats = (ffprobeFormatsStr || '').split(',').map((str) => str.trim()).filter(Boolean);if (ffprobeFormats.length === 0) {- console.warn('ffprobe returned unknown formats', ffprobeFormatsStr);+ console.warn('FFprobe returned unknown formats', ffprobeFormatsStr);return undefined;}+ console.log('FFprobe detected format(s)', ffprobeFormatsStr);+const [firstFfprobeFormat] = ffprobeFormats;if (ffprobeFormats.length === 1) return firstFfprobeFormat;@@ -326,9 +328,8 @@ async function determineOutputFormat(ffprobeFormatsStr: string | undefined, file}}-export async function getSmarterOutFormat({ filePath, fileMeta: { format, streams } }: { filePath: string, fileMeta: { format: FFprobeFormat, streams: FFprobeStream[] } }) {- const formatsStr = format.format_name;- const assumedFormat = await determineOutputFormat(formatsStr, filePath);+export async function getDefaultOutFormat({ filePath, fileMeta: { format, streams } }: { filePath: string, fileMeta: { format: Pick<FFprobeFormat, 'format_name'>, streams: FFprobeStream[] } }) {+ const assumedFormat = await determineOutputFormat(format.format_name, filePath);return mapDefaultFormat({ streams, requestedFormat: assumedFormat });}