Mac FFmpeg works

.gitignore

@@ -10,6 +10,12 @@
 /remote
 /.idea
 
+/ffmpeg/ffmpeg
+/ffmpeg/ffprobe
+
+/ffmpeg/ffmpeg.exe
+/ffmpeg/ffprobe.exe
+
 *.js
 *.js.map
 *.log

README.md

@@ -34,6 +34,8 @@ See [issues](https://github.com/whyboris/Video-Hub-App/issues) for what is in pr
 
 ⚠ The repository is usually ahead of the publicly [released version](https://github.com/whyboris/Video-Hub-App/releases) - it is 🚧 WIP and may have bugs in it.
 
+⚠ For screenshot generation to work, download and place `ffmpeg` and `ffprobe` executable into the `ffmpeg` folder. You can download the files from [FFmpeg](https://ffmpeg.org/download.html). For [windows](https://www.gyan.dev/ffmpeg/builds/) you can download `release-full` which will include hardware acceleration for nvidia (to enable, toggle `nvidiaBuild` variable in `main-extract.ts`).
+
 How to start:
 
 - `npm install --legacy-peer-deps` to install

electron-builder.json

@@ -17,6 +17,10 @@
     "!tslint.json"
   ],
   "extraResources": [
+    {
+      "from": "ffmpeg",
+      "to": "ffmpeg"
+    },
     {
       "from": "src/assets/icons/mac/touch-bar",
       "to": "assets"

node/main-extract.ts

@@ -1,3 +1,5 @@
+import { app } from "electron";
+
 /**
  * This file contains all the logic for extracting:
  * first thumbnail,
@@ -25,7 +27,7 @@ const fs = require('fs');
 import * as path from 'path';
 const spawn = require('child_process').spawn;
 
-const ffmpegPath = require('ffmpeg-static').replace('app.asar', 'app.asar.unpacked');
+const ffmpegPath: string = app.isPackaged ? (process.resourcesPath + '/ffmpeg/ffmpeg') : './ffmpeg/ffmpeg';
 
 import { GLOBALS } from './main-globals';
 
@@ -36,6 +38,20 @@ import type { ImageElement, ScreenshotSettings } from '../interfaces/final-objec
 //          FFMPEG arg generating functions
 // ========================================================================================
 
+/**
+ * nVidia-accelerated GPU decoding for screenshot generation
+ * added conditionally on `nvidiaBuild` variable
+ */
+const prependNvidiaAccelerationArgumentsIfEnabled = (args: string[]): string[] => {
+
+  if (GLOBALS.nvidiaBuild) {
+    args.push('-hwaccel');
+    args.push('cuda');
+  }
+
+  return args;
+}
+
 /**
  * Generate the ffmpeg args to extract a single frame according to settings
  * @param pathToVideo
@@ -52,7 +68,12 @@ const extractSingleFrameArgs = (
 
   const ssWidth: number = screenshotHeight * (16 / 9);
 
+  const nvidia: string[] = [];
+
+  prependNvidiaAccelerationArgumentsIfEnabled(nvidia);
+
   const args: string[] = [
+    ...nvidia,
     '-ss', (duration / 10).toString(),
     '-i', pathToVideo,
     '-frames', '1',
@@ -88,6 +109,8 @@ const generateScreenshotStripArgs = (
   const totalCount = numberOfScreenshots;
   const step: number = duration / (totalCount + 1);
   const args: string[] = [];
+  prependNvidiaAccelerationArgumentsIfEnabled(args);
+
   let allFramesFiltered = '';
   let outputFrames = '';
 
@@ -137,6 +160,8 @@ const generatePreviewClipArgs = (
   const totalCount = clipSnippets;
   const step: number = duration / (totalCount + 1);
   const args: string[] = [];
+  prependNvidiaAccelerationArgumentsIfEnabled(args);
+
   let concat = '';
 
   // make the magic filter

node/main-globals.ts

@@ -1,19 +1,21 @@
 import type { ScreenshotSettings, InputSources } from '../interfaces/final-object.interface';
 
-// For release, update 4 values:                                                                          <---- !!! RELEASE !!!
+// For release, update 5 values:                                                                          <---- !!! RELEASE !!!
 //
 // `demo: true,`                 -- below
 // `version: 'X.X.X',`           -- below
+// `nvidiaBuild: true,           -- below (separate build, requires nvidia FFmpeg)
 // `"version": "X.X.X",`         -- package.json
 // `"productName": "... Demo"    -- electron-builder.json
 
 export const GLOBALS: VhaGlobals = {
   angularApp: null,            // reference used to send messages back to Angular App
   currentlyOpenVhaFile: '',    // OFFICAL DECREE IN NODE WHICH FILE IS CURRENTLY OPEN !!!
   debug: false,
+  nvidiaBuild: false,          // make sure to use FFmpeg with nvidia cuda abilities                      <---- !!! RELEASE !!!
   demo: false,                 // change to `true` during release                                         <---- !!! RELEASE !!!
   hubName: 'untitled',         // in case user doesn't name their hub any name
-  macVersion: false,           // auto updated by `main.ts`
+  macVersion: true,           // auto updated by `main.ts`
   readyToQuit: false,          // hack to quit gracefully
   selectedOutputFolder: '',
   selectedSourceFolders: {},
@@ -40,6 +42,7 @@ export interface VhaGlobals {
   demo: boolean;
   hubName: string;
   macVersion: boolean;
+  nvidiaBuild: boolean;
   readyToQuit: boolean;
   screenshotSettings: ScreenshotSettings;
   selectedOutputFolder: string;

node/main-support.ts

@@ -1,3 +1,5 @@
+import { app } from "electron"
+
 /*
  * This whole file is meant to contain only PURE functions
  *
@@ -12,7 +14,9 @@ import { GLOBALS } from './main-globals'; // TODO -- eliminate dependence on `GL
 import * as path from 'path';
 
 const exec = require('child_process').exec;
-const ffprobePath = require('@ffprobe-installer/ffprobe').path.replace('app.asar', 'app.asar.unpacked');
+
+const ffprobePath: string = app.isPackaged ? (process.resourcesPath + '/ffmpeg/ffprobe') : './ffmpeg/ffprobe';
+
 const fs = require('fs');
 const hash = require('object-hash');
 const hasher = require('crypto').createHash;