Skip to content

better extraction timeouts #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 10, 2021
Merged

better extraction timeouts #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a68296b
better extraction timeouts
whyboris Jul 10, 2021
a15cc5d
comment
whyboris Jul 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion node/main-extract-async.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ function thumbQueueRunner(element: ImageElement, done): void {
GLOBALS.selectedSourceFolders[element.inputSource].path,
screenshotOutputFolder,
GLOBALS.screenshotSettings,
true, // `deepScan` always on by default -- maybe should be different?
done
);
});
Expand Down Expand Up @@ -455,12 +454,16 @@ function hasAllThumbs(
const thumb: string = path.join(screenshotFolder, '/thumbnails/', fileHash + '.jpg');
const filmstrip: string = path.join(screenshotFolder, '/filmstrips/', fileHash + '.jpg');
const clip: string = path.join(screenshotFolder, '/clips/', fileHash + '.mp4');
const clipThumb: string = path.join(screenshotFolder, '/clips/', fileHash + '.jpg');

Promise.all([
fs.promises.access(thumb, fs.constants.F_OK),
fs.promises.access(filmstrip, fs.constants.F_OK),
shouldExtractClips
? fs.promises.access(clip, fs.constants.F_OK)
: 'ok',
shouldExtractClips
? fs.promises.access(clipThumb, fs.constants.F_OK)
: 'ok'
])
.then(() => {
Expand Down
45 changes: 20 additions & 25 deletions node/main-extract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,15 +232,13 @@ const extractFirstFrameArgs = (
* @param videoFolderPath -- path to base folder where videos are
* @param screenshotFolder -- path to folder where .jpg files will be saved
* @param screenshotSettings -- ScreenshotSettings object
* @param deepScan -- spend 50% more time trying to extracts screenshots
* @param done -- execute this method when done extracting
*/
export function extractAll(
currentElement: ImageElement,
videoFolderPath: string,
screenshotFolder: string,
screenshotSettings: ScreenshotSettings,
deepScan: boolean,
done
): void {

Expand All @@ -256,13 +254,13 @@ export function extractAll(
const numOfScreens: number = currentElement.screens;
const sourceHeight: number = currentElement.height;

const thumbnailSavePath: string = screenshotFolder + '/thumbnails/' + fileHash + '.jpg';
const filmstripSavePath: string = screenshotFolder + '/filmstrips/' + fileHash + '.jpg';
const clipSavePath: string = screenshotFolder + '/clips/' + fileHash + '.mp4';
const clipThumbSavePath: string = screenshotFolder + '/clips/' + fileHash + '.jpg';
const thumbnailSavePath: string = path.normalize(screenshotFolder + '/thumbnails/' + fileHash + '.jpg');
const filmstripSavePath: string = path.normalize(screenshotFolder + '/filmstrips/' + fileHash + '.jpg');
const clipSavePath: string = path.normalize(screenshotFolder + '/clips/' + fileHash + '.mp4');
const clipThumbSavePath: string = path.normalize(screenshotFolder + '/clips/' + fileHash + '.jpg');

const maxRunTime: ExtractionDurations = setExtractionDurations(
sourceHeight, numOfScreens, screenshotHeight, clipSnippets, snippetLength, clipHeight, deepScan
sourceHeight, numOfScreens, screenshotHeight, clipSnippets, snippetLength, clipHeight
);

checkFileExists(pathToVideo) // (1)
Expand Down Expand Up @@ -395,38 +393,35 @@ interface ExtractionDurations {
* @param clipSnippets
* @param snippetLength
* @param clipHeight
* @param deepScan -- whether to spend 50% more time extracting screenshots
*/
function setExtractionDurations(
sourceHeight: number,
numOfScreens: number,
screenshotHeight: number,
clipSnippets: number,
snippetLength: number,
clipHeight: number,
deepScan: boolean
clipHeight: number
): ExtractionDurations {

// screenshot heights range from 144px to 504px
// we'll call 144 the baseline and increase duration based on this
// number of pixels grows ~ as square of height, so we square below
// this means at highest resolution we multyply by 9 the time we wait
const thumbHeightRatio = screenshotHeight / 144;
const thumbHeightFactor = thumbHeightRatio * thumbHeightRatio; // square of ratio
// this means at highest resolution we multyply by 12.5 the time we wait
const thumbHeightRatio = screenshotHeight / 144; // max 3.5 or 12.25 when squared
const thumbHeightFactor = 1 + (thumbHeightRatio * thumbHeightRatio / 4); // square of ratio
// not using Math.pow(n,2) because this is apparently faster https://stackoverflow.com/a/26594370/5017391

const clipHeightRatio = clipHeight / 144;
const clipHeightFactor = clipHeightRatio * clipHeightRatio; // square of ratio

const sourceFactor = sourceHeight === 0 ? 1 : sourceHeight / 720; // may be better as a square rather than linear
const clipHeightRatio = clipHeight / 144; // max 3.5 or 12.25 when squared
const clipHeightFactor = 1 + (clipHeightRatio * clipHeightRatio / 4); // square of ratio

const multiplier = deepScan ? 1 : 1.5; // always `true` by default, but should be different?
const sourceRatio = (sourceHeight === 0) ? 1 : (sourceHeight / 720); // 3 when source is 4k
const sourceFactor = 1 + (sourceRatio * sourceRatio / 3); // square of ratio

return { // for me:
thumb: 350 * multiplier * sourceFactor * thumbHeightFactor, // never above 300ms
filmstrip: 350 * multiplier * sourceFactor * numOfScreens * thumbHeightFactor, // rarely above 15s, but 4K 30screens took 50s
clip: 1000 * multiplier * sourceFactor * clipSnippets * snippetLength * clipHeightFactor, // barely ever above 15s
clipThumb: 150 * multiplier * sourceFactor * clipHeightFactor, // never above 100ms
return { // for me:
thumb: 500 * sourceFactor * thumbHeightFactor, // never above 800ms
filmstrip: 350 * sourceFactor * thumbHeightFactor * numOfScreens, // rarely above 15s, but 4K 30screens took 50s
clip: 350 * sourceFactor * clipHeightFactor * clipSnippets * snippetLength, // rarely above 15s
clipThumb: 400 * clipHeightRatio, // never above 600ms
};
}

Expand Down Expand Up @@ -499,7 +494,7 @@ function spawn_ffmpeg_and_run(

return new Promise((resolve, reject) => {

// Uncomment things in this method to check how long extraction takes
// Uncomment things in this method (and the `performance` import) to check how long extraction takes
// const t0: number = performance.now();

const ffmpeg_process = spawn(ffmpegPath, args);
Expand Down Expand Up @@ -527,7 +522,7 @@ function spawn_ffmpeg_and_run(
ffmpeg_process.on('exit', () => {
clearTimeout(killProcessTimeout);
// const t1: number = performance.now();
// console.log(description + ': ' + (t1 - t0).toString());
// console.log(description + ' ' + Math.round(t1 - t0) + ' < ' + maxRunningTime);
return resolve(true);
});

Expand Down