The swiss army knife of lossless video/audio editing
DRY flac encode args, add test for flac frame size
Claude1c217752bfe9
diff --git a/src/renderer/src/hooks/useFfmpegOperations.ts b/src/renderer/src/hooks/useFfmpegOperations.tsindex f6831ae0..210afbee 100644--- a/src/renderer/src/hooks/useFfmpegOperations.ts+++ b/src/renderer/src/hooks/useFfmpegOperations.ts@@ -6,7 +6,7 @@ import i18n from 'i18next';import { getSuffixedOutPath, transferTimestamps, getOutFileExtension, getOutDir, getHtml5ifiedPath, unlinkWithRetry, getFrameDuration, isMac, html5ifiedPrefix, html5dummySuffix, assertFileExists } from '../util';import { isCuttingStart, isCuttingEnd, runFfmpegWithProgress, getFfCommandLine, getDuration, createChaptersFromSegments, readFileFfprobeMeta, getExperimentalArgs, getVideoTimescaleArgs, logStdoutStderr, runFfmpegConcat, RefuseOverwriteError, runFfmpeg } from '../ffmpeg';-import { flacFrameSize, getEffectiveAvoidNegativeTs, getKeyframeCutSeekCompensation, getMapStreamsArgs, getStreamIdsToCopy, isCopyingOnlyAudioStreams, isCropActive, isAspectRatioActive } from '../util/streams';+import { flacEncodeArgs, getEffectiveAvoidNegativeTs, getKeyframeCutSeekCompensation, getMapStreamsArgs, getStreamIdsToCopy, isCopyingOnlyAudioStreams, isCropActive, isAspectRatioActive } from '../util/streams';import { needsSmartCut, getCodecParams } from '../smartcut';import { getGuaranteedSegments, isDurationValid } from '../segments';import type { FFprobeStream } from '../../../common/ffprobe';@@ -788,7 +788,7 @@ function useFfmpegOperations({ filePath, treatInputFileModifiedTimeAsStart, trea// This is just a fast way of generating an empty dummy file'-f', 'lavfi', '-i', 'anullsrc=channel_layout=stereo:sample_rate=44100','-t', String(duration),- '-acodec', 'flac', '-frame_size', flacFrameSize,+ ...flacEncodeArgs,'-y', outPath,];@@ -884,7 +884,7 @@ function useFfmpegOperations({ filePath, treatInputFileModifiedTimeAsStart, treaif (isMac) {audioArgs = ['-acodec', 'aac_at', '-b:a', '192k'];} else {- audioArgs = ['-acodec', 'flac', '-frame_size', flacFrameSize];+ audioArgs = [...flacEncodeArgs];}break;}@@ -893,7 +893,7 @@ function useFfmpegOperations({ filePath, treatInputFileModifiedTimeAsStart, treaif (isMac) {audioArgs = ['-acodec', 'aac_at', '-ar', '44100', '-ac', '2', '-b:a', '96k'];} else {- audioArgs = ['-acodec', 'flac', '-frame_size', flacFrameSize, '-ar', '11025', '-ac', '2'];+ audioArgs = [...flacEncodeArgs, '-ar', '11025', '-ac', '2'];}break;}diff --git a/src/renderer/src/util/streams.test.ts b/src/renderer/src/util/streams.test.tsindex 24151eb3..9abcd0a7 100644--- a/src/renderer/src/util/streams.test.ts+++ b/src/renderer/src/util/streams.test.ts@@ -64,6 +64,22 @@ test('getMapStreamsArgs', () => {]);});+test('getMapStreamsArgs, flac re-encode sets frame size', () => {+ const flacStreams: LiteFFprobeStream[] = [+ { index: 0, codec_type: 'video', codec_tag: '0x0000', codec_name: 'mjpeg', time_base: '', disposition: makeDisposition({ attached_pic: 1 }) },+ { index: 1, codec_type: 'audio', codec_tag: '0x0000', codec_name: 'flac', time_base: '', disposition: makeDisposition() },+ ];+ expect(getMapStreamsArgs({+ allFilesMeta: { [path]: { streams: flacStreams } },+ copyFileStreams: [{ path, streamIds: [0, 1] }],+ outFormat: 'flac',+ needFlac: true,+ })).toEqual([+ '-map', '0:0', '-c:0', 'copy',+ '-map', '0:1', '-c:1', 'flac', '-frame_size:1', '4608',+ ]);+});+test('getMapStreamsArgs, subtitles to matroska', () => {const outFormat = 'matroska';diff --git a/src/renderer/src/util/streams.ts b/src/renderer/src/util/streams.tsindex 1d2aa14b..9e13b232 100644--- a/src/renderer/src/util/streams.ts+++ b/src/renderer/src/util/streams.ts@@ -5,11 +5,12 @@ import type { AllFilesMeta, BsfAspectRatioParams, BsfCropParams, ChromiumHTMLAudimport type { FileStream } from '../ffmpeg';-// taken from `ffmpeg -codecs`// Since ffmpeg 9, the CLI forces fixed-frame-size encoders like FLAC to use the input's frame size (e.g. 1024 for AAC),// which makes FLAC files much bigger. 4608 is FLAC's standard block size, and compresses best also at low sample rates.export const flacFrameSize = '4608';+export const flacEncodeArgs = ['-acodec', 'flac', '-frame_size', flacFrameSize];+// taken from `ffmpeg -codecs`export const pcmAudioCodecs = ['adpcm_4xm','adpcm_adx',