Mirrors/lossless-cut
1
0
Fork 0
mirror of https://github.com/mifi/lossless-cut.git synced 2024-11-24 03:12:41 +01:00
Code Issues Releases Activity

type etc

Browse Source
This commit is contained in:
Mikael Finstad 2024-09-26 13:39:16 +02:00
parent 7d306f7736
commit 9c733742a2
No known key found for this signature in database
GPG Key ID: 25AB36E3E81CBC26
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/renderer/src/App.tsx
View File

@ -1598,9 +1598,9 @@ function App() {
const tryFixInvalidDuration = useCallback(async () => {
if (!checkFileOpened() || workingRef.current) return;
try {
setWorking({ text: i18n.t('Fixing file duration') });
setProgress(0);
await withErrorHandling(async () => {
setWorking({ text: i18n.t('Fixing file duration') });
setProgress(0);
invariant(fileFormat != null);
const path = await fixInvalidDuration({ fileFormat, customOutDir, onProgress: setProgress });
showNotification({ icon: 'info', text: i18n.t('Duration has been fixed') });

28
src/renderer/src/hooks/useFfmpegOperations.ts
View File

@ -235,8 +235,26 @@ function useFfmpegOperations({ filePath, treatInputFileModifiedTimeAsStart, trea
keyframeCut: ssBeforeInput, avoidNegativeTs, copyFileStreams, cutFrom, cutTo, chaptersPath, onProgress, outPath,
videoDuration, rotation, allFilesMeta, outFormat, shortestFlag, ffmpegExperimental, preserveMovData, movFastStart, customTagsByFile, paramsByStreamId, videoTimebase, detectedFps,
}: {
keyframeCut: boolean, avoidNegativeTs: AvoidNegativeTs | undefined, copyFileStreams: CopyfileStreams, cutFrom: number, cutTo: number, chaptersPath?: string | undefined, onProgress: (p: number) => void, outPath: string,
videoDuration: number | undefined, rotation: number | undefined, allFilesMeta: AllFilesMeta, outFormat: string, shortestFlag: boolean, ffmpegExperimental: boolean, preserveMovData: boolean, movFastStart: boolean, customTagsByFile: CustomTagsByFile, paramsByStreamId: ParamsByStreamId, videoTimebase?: number | undefined, detectedFps?: number,
keyframeCut: boolean,
avoidNegativeTs: AvoidNegativeTs | undefined,
copyFileStreams: CopyfileStreams,
cutFrom: number,
cutTo: number,
chaptersPath?: string | undefined,
onProgress: (p: number) => void,
outPath: string,
videoDuration: number | undefined,
rotation: number | undefined,
allFilesMeta: AllFilesMeta,
outFormat: string,
shortestFlag: boolean,
ffmpegExperimental: boolean,
preserveMovData: boolean,
movFastStart: boolean,
customTagsByFile: CustomTagsByFile,
paramsByStreamId: ParamsByStreamId,
videoTimebase?: number | undefined,
detectedFps?: number,
}) => {
if (await shouldSkipExistingFile(outPath)) return;
@ -413,8 +431,8 @@ function useFfmpegOperations({ filePath, treatInputFileModifiedTimeAsStart, trea
console.log('customTagsByFile', customTagsByFile);
console.log('paramsByStreamId', paramsByStreamId);
const singleProgresses = {};
function onSingleProgress(id, singleProgress) {
const singleProgresses: Record<number, number> = {};
function onSingleProgress(id: number, singleProgress: number) {
singleProgresses[id] = singleProgress;
return onTotalProgress((sum(Object.values(singleProgresses)) / segments.length));
}
@ -425,7 +443,7 @@ function useFfmpegOperations({ filePath, treatInputFileModifiedTimeAsStart, trea
// or if enabled, will first cut&encode the part before the next keyframe, trying to match the input file's codec params
// then it will cut the part *from* the keyframe to "end", and concat them together and return the concated file
// so that for the calling code it looks as if it's just a normal segment
async function maybeSmartCutSegment({ start: desiredCutFrom, end: cutTo }, i) {
async function maybeSmartCutSegment({ start: desiredCutFrom, end: cutTo }: { start: number, end: number }, i: number) {
async function makeSegmentOutPath() {
const outPath = join(outputDir, outSegFileNames[i]!);
// because outSegFileNames might contain slashes https://github.com/mifi/lossless-cut/issues/1532