Mirrors/lossless-cut
1
0
Fork 0
mirror of https://github.com/mifi/lossless-cut.git synced 2024-11-22 10:22:31 +01:00
Code Issues Releases Activity

improve black detect

Browse Source 
allow black detect to work on start/end times of selected segment
closes #1226
This commit is contained in:
Mikael Finstad 2022-10-14 20:08:58 +02:00
parent 280068a08f
commit 0803858575
No known key found for this signature in database
GPG Key ID: 25AB36E3E81CBC26
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/App.jsx
View File

@ -1757,9 +1757,9 @@ const App = memo(() => {
setWorking(i18n.t('Detecting black scenes'));
setCutProgress(0);
const blackSegments = await blackDetect({ filePath, duration, onProgress: setCutProgress });
const blackSegments = await blackDetect({ filePath, duration, onProgress: setCutProgress, from: currentApparentCutSeg.start, to: currentApparentCutSeg.end });
console.log('blackSegments', blackSegments);
loadCutSegments(blackSegments.map(({ blackStart, blackEnd }) => ({ start: blackStart, end: blackEnd })));
loadCutSegments(blackSegments.map(({ blackStart, blackEnd }) => ({ start: blackStart, end: blackEnd })), true);
} catch (err) {
errorToast(i18n.t('Failed to detect black scenes'));
console.error('Failed to detect black scenes', err);
@ -1767,7 +1767,7 @@ const App = memo(() => {
setWorking();
setCutProgress();
}
}, [duration, filePath, setWorking, loadCutSegments]);
}, [filePath, setWorking, duration, currentApparentCutSeg, loadCutSegments]);
const userHtml5ifyCurrentFile = useCallback(async () => {
if (!filePath) return;

13
src/ffmpeg.js
View File

@ -532,8 +532,14 @@ export async function renderWaveformPng({ filePath, aroundTime, window, color })
}
}
export async function blackDetect({ filePath, duration, minInterval = 0.05, onProgress }) {
const args = ['-hide_banner', '-i', filePath, '-vf', `blackdetect=d=${minInterval}`, '-an', '-f', 'null', '-'];
export async function blackDetect({ filePath, duration, minInterval = 0.05, onProgress, from, to }) {
const args = [
'-hide_banner',
...(from != null ? ['-ss', from.toFixed(5)] : []),
'-i', filePath,
...(to != null ? ['-t', (to - from).toFixed(5)] : []),
'-vf', `blackdetect=d=${minInterval}`, '-an', '-f', 'null', '-',
];
const process = execa(getFfmpegPath(), args, { encoding: null, buffer: false });
const blackSegments = [];
@ -549,7 +555,8 @@ export async function blackDetect({ filePath, duration, minInterval = 0.05, onPr
handleProgress(process, duration, onProgress, customMatcher);
await process;
return blackSegments;
const offset = from != null ? from : 0;
return blackSegments.map(({ blackStart, blackEnd }) => ({ blackStart: blackStart + offset, blackEnd: blackEnd + offset }));
}
export async function extractWaveform({ filePath, outPath }) {