Add support for HEVC, use ffmpeg-static (#1021)

Author: codetheweb

main/common/constants.ts

@@ -3,12 +3,12 @@ import {Format} from './types';
 export const supportedVideoExtensions = ['mp4', 'mov', 'm4v'];
 
 const formatExtensions = new Map([
-  ['av1', 'mp4']
+  ['av1', 'mp4'],
+  ['hevc', 'mp4']
 ]);
 
-export const formats = [Format.mp4, Format.av1, Format.gif, Format.apng, Format.webm];
+export const formats = [Format.mp4, Format.hevc, Format.av1, Format.gif, Format.apng, Format.webm];
 
 export const getFormatExtension = (format: Format) => formatExtensions.get(format) ?? format;
 
 export const defaultInputDeviceId = 'SYSTEM_DEFAULT';
-

main/common/types/base.ts

@@ -2,6 +2,7 @@ import {Rectangle} from 'electron';
 
 export enum Format {
   gif = 'gif',
+  hevc = 'hevc',
   mp4 = 'mp4',
   webm = 'webm',
   apng = 'apng',

main/converters/h264.ts

@@ -204,6 +204,38 @@ const convertToAv1 = (options: ConvertOptions) => convert(options.outputPath, {
   options.outputPath
 ));
 
+// eslint-disable-next-line @typescript-eslint/promise-function-async
+const convertToHevc = (options: ConvertOptions) => convert(options.outputPath, {
+  onProgress: (progress, estimate) => {
+    options.onProgress('Converting', progress, estimate);
+  },
+  startTime: options.startTime,
+  endTime: options.endTime
+}, conditionalArgs(
+  '-i', options.inputPath,
+  '-r', options.fps.toString(),
+  '-c:v', 'libx265',
+  '-c:a', 'libopus',
+  '-preset', 'medium',
+  '-tag:v', 'hvc1', // Metadata for macOS
+  {
+    args: ['-an'],
+    if: options.shouldMute
+  },
+  {
+    args: [
+      '-s',
+      `${makeEven(options.width)}x${makeEven(options.height)}`,
+      '-ss',
+      options.startTime.toString(),
+      '-to',
+      options.endTime.toString()
+    ],
+    if: options.shouldCrop || !areDimensionsEven(options)
+  },
+  options.outputPath
+));
+
 // eslint-disable-next-line @typescript-eslint/promise-function-async
 const convertToApng = (options: ConvertOptions) => convert(options.outputPath, {
   onProgress: (progress, estimate) => {
@@ -250,6 +282,7 @@ export const crop = (options: ConvertOptions) => convert(options.outputPath, {
 export default new Map([
   [Format.gif, convertToGif],
   [Format.mp4, convertToMp4],
+  [Format.hevc, convertToHevc],
   [Format.webm, convertToWebm],
   [Format.apng, convertToApng],
   [Format.av1, convertToAv1]

main/converters/process.ts

@@ -9,10 +9,9 @@ import {track} from '../common/analytics';
 import {conditionalArgs, extractProgressFromStderr} from './utils';
 import {settings} from '../common/settings';
 
-const ffmpeg = require('@ffmpeg-installer/ffmpeg');
-const gifsicle = require('gifsicle');
+import ffmpegPath from '../utils/ffmpeg-path';
 
-const ffmpegPath = util.fixPathForAsarUnpack(ffmpeg.path);
+const gifsicle = require('gifsicle');
 const gifsiclePath = util.fixPathForAsarUnpack(gifsicle);
 
 enum Mode {

main/plugins/built-in/open-with-plugin.ts

@@ -30,7 +30,7 @@ const getAppsForFormat = (format: Format) => {
     });
 };
 
-const appsForFormat = (['mp4', 'gif', 'apng', 'webm', 'av1'] as Format[])
+const appsForFormat = (['mp4', 'gif', 'apng', 'webm', 'av1', 'hevc'] as Format[])
   .map(format => ({
     format,
     apps: getAppsForFormat(format)
@@ -44,4 +44,3 @@ export const shareServices = [{
   formats: [...apps.keys()],
   action
 }];
-

main/plugins/built-in/save-file-plugin.ts

@@ -41,7 +41,8 @@ const saveFile = {
     'mp4',
     'webm',
     'apng',
-    'av1'
+    'av1',
+    'hevc'
   ],
   action
 };
@@ -53,7 +54,8 @@ const filterMap = new Map([
   [Format.webm, [{name: 'Movies', extensions: ['webm']}]],
   [Format.gif, [{name: 'Images', extensions: ['gif']}]],
   [Format.apng, [{name: 'Images', extensions: ['apng']}]],
-  [Format.av1, [{name: 'Movies', extensions: ['mp4']}]]
+  [Format.av1, [{name: 'Movies', extensions: ['mp4']}]],
+  [Format.hevc, [{name: 'Movies', extensions: ['mp4']}]]
 ]);
 
 let lastSavedDirectory: string;
@@ -83,4 +85,3 @@ export const askForTargetFilePath = async (
 
   return undefined;
 };
-

main/recording-history.ts

@@ -4,7 +4,6 @@
 import {shell, clipboard} from 'electron';
 import fs from 'fs';
 import Store from 'electron-store';
-import util from 'electron-util';
 import execa from 'execa';
 import tempy from 'tempy';
 import {SetOptional} from 'type-fest';
@@ -16,8 +15,7 @@ import {Video} from './video';
 import {ApertureOptions} from './common/types';
 import Sentry, {isSentryEnabled} from './utils/sentry';
 
-const ffmpeg = require('@ffmpeg-installer/ffmpeg');
-const ffmpegPath = util.fixPathForAsarUnpack(ffmpeg.path);
+import ffmpegPath from './utils/ffmpeg-path';
 
 export interface PastRecording {
   filePath: string;

main/remote-states/editor-options.ts

@@ -9,9 +9,10 @@ import {prettifyFormat} from '../utils/formats';
 const exportUsageHistory = new Store<{[key in Format]: {lastUsed: number; plugins: Record<string, number>}}>({
   name: 'export-usage-history',
   defaults: {
-    gif: {lastUsed: 5, plugins: {default: 1}},
-    mp4: {lastUsed: 4, plugins: {default: 1}},
-    webm: {lastUsed: 3, plugins: {default: 1}},
+    gif: {lastUsed: 6, plugins: {default: 1}},
+    mp4: {lastUsed: 5, plugins: {default: 1}},
+    webm: {lastUsed: 4, plugins: {default: 1}},
+    hevc: {lastUsed: 3, plugins: {default: 1}},
     av1: {lastUsed: 2, plugins: {default: 1}},
     apng: {lastUsed: 1, plugins: {default: 1}}
   }
@@ -44,6 +45,11 @@ const fpsUsageHistory = new Store<{[key in Format]: number}>({
       type: 'number',
       minimum: 0,
       default: 60
+    },
+    hevc: {
+      type: 'number',
+      minimum: 0,
+      default: 60
     }
   }
 });

main/utils/encoding.ts

@@ -1,13 +1,10 @@
 /* eslint-disable array-element-newline */
 
 import path from 'path';
-import util from 'electron-util';
 import execa from 'execa';
 import tempy from 'tempy';
 import {track} from '../common/analytics';
-
-const ffmpeg = require('@ffmpeg-installer/ffmpeg');
-const ffmpegPath = util.fixPathForAsarUnpack(ffmpeg.path);
+import ffmpegPath from './ffmpeg-path';
 
 export const getEncoding = async (filePath: string) => {
   try {

main/utils/ffmpeg-path.ts

@@ -0,0 +1,6 @@
+import ffmpeg from 'ffmpeg-static';
+import util from 'electron-util';
+
+const ffmpegPath = util.fixPathForAsarUnpack(ffmpeg);
+
+export default ffmpegPath;