Merge pull request #480 from HaveAGitGat/2.10.01

2.10.01

FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetVideoEncoder/1.0.0/index.ts

@@ -32,6 +32,7 @@ const details = (): IpluginDetails => ({
           // 'vp9',
           'h264',
           // 'vp8',
+          'av1',
         ],
       },
       tooltip: 'Specify codec of the output file',
@@ -153,7 +154,7 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
           stream.outputArgs.push('-crf', ffmpegQuality);
         }
 
-        if (ffmpegPreset) {
+        if (targetCodec !== 'av1' && ffmpegPreset) {
           stream.outputArgs.push('-preset', ffmpegPreset);
         }
 

FlowPluginsTs/CommunityFlowPlugins/tools/checkNodeHardwareEncoder/1.0.0/index.ts

@@ -0,0 +1,88 @@
+import { getEncoder } from '../../../../FlowHelpers/1.0.0/hardwareUtils';
+import {
+  IpluginDetails,
+  IpluginInputArgs,
+  IpluginOutputArgs,
+} from '../../../../FlowHelpers/1.0.0/interfaces/interfaces';
+
+/* eslint no-plusplus: ["error", { "allowForLoopAfterthoughts": true }] */
+const details = (): IpluginDetails => ({
+  name: 'Check Node Hardware Encoder',
+  description: `
+  Check if node hardware encoder is available. Can also be used to check for specific hardware.
+  For example:
+
+  hevc_nvenc = Nvidia
+  hevc_amf = AMD
+  hevc_vaapi = Intel
+  hevc_qsv = Intel
+  hevc_videotoolbox = Apple
+  `,
+  style: {
+    borderColor: 'orange',
+  },
+  tags: '',
+  isStartPlugin: false,
+  pType: '',
+  requiresVersion: '2.11.01',
+  sidebarPosition: -1,
+  icon: 'faQuestion',
+  inputs: [
+    {
+      name: 'hardwareEncoder',
+      type: 'string',
+      defaultValue: 'hevc_nvenc',
+      inputUI: {
+        type: 'dropdown',
+        options: [
+          'hevc_nvenc',
+          'hevc_amf',
+          'hevc_vaapi',
+          'hevc_qsv',
+          'hevc_videotoolbox',
+        ],
+      },
+      tooltip: 'Specify hardware (based on encoder) to check for',
+    },
+  ],
+  outputs: [
+    {
+      number: 1,
+      tooltip: 'Node has hardware',
+    },
+    {
+      number: 2,
+      tooltip: 'Node does not have hardware',
+    },
+  ],
+});
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
+  const lib = require('../../../../../methods/lib')();
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
+  args.inputs = lib.loadDefaultValues(args.inputs, details);
+
+  const { hardwareEncoder } = args.inputs;
+
+  // eslint-disable-next-line no-await-in-loop
+  const encoderProperties = await getEncoder({
+    targetCodec: 'hevc',
+    hardwareEncoding: true,
+    args,
+  });
+
+  const nodeHasHardware = encoderProperties.enabledDevices.some((row) => row.encoder === hardwareEncoder);
+
+  args.jobLog(`Node has hardwareEncoder ${hardwareEncoder}: ${nodeHasHardware}`);
+
+  return {
+    outputFileObj: args.inputFileObj,
+    outputNumber: nodeHasHardware ? 1 : 2,
+    variables: args.variables,
+  };
+};
+export {
+  details,
+  plugin,
+};

FlowPluginsTs/FlowHelpers/1.0.0/hardwareUtils.ts

@@ -117,6 +117,8 @@ const encoderFilter = (encoder:string, targetCodec:string) => {
     return true;
   } if (targetCodec === 'h264' && encoder.includes('h264')) {
     return true;
+  } if (targetCodec === 'av1' && encoder.includes('av1')) {
+    return true;
   }
 
   return false;
@@ -135,11 +137,12 @@ export const getEncoder = async ({
   inputArgs: string[],
   outputArgs: string[],
   isGpu: boolean,
+  enabledDevices: IgpuEncoder[],
 }> => {
   if (
     args.workerType
     && args.workerType.includes('gpu')
-    && hardwareEncoding && (targetCodec === 'hevc' || targetCodec === 'h264')) {
+    && hardwareEncoding && (['hevc', 'h264', 'av1'].includes(targetCodec))) {
     const gpuEncoders: IgpuEncoder[] = [
       {
         encoder: 'hevc_nvenc',
@@ -193,6 +196,7 @@ export const getEncoder = async ({
         filter: '',
       },
 
+      // h264
       {
         encoder: 'h264_nvenc',
         enabled: false,
@@ -230,10 +234,42 @@ export const getEncoder = async ({
         outputArgs: [],
         filter: '',
       },
+
+      // av1
+      {
+        encoder: 'av1_nvenc',
+        enabled: false,
+        inputArgs: [],
+        outputArgs: [],
+        filter: '',
+      },
+      {
+        encoder: 'av1_amf',
+        enabled: false,
+        inputArgs: [],
+        outputArgs: [],
+        filter: '',
+      },
+      {
+        encoder: 'av1_vaapi',
+        enabled: false,
+        inputArgs: [],
+        outputArgs: [],
+        filter: '',
+      },
+      {
+        encoder: 'av1_qsv',
+        enabled: false,
+        inputArgs: [],
+        outputArgs: [],
+        filter: '',
+      },
     ];
 
     const filteredGpuEncoders = gpuEncoders.filter((device) => encoderFilter(device.encoder, targetCodec));
 
+    args.jobLog(JSON.stringify({ filteredGpuEncoders }));
+
     // eslint-disable-next-line no-restricted-syntax
     for (const gpuEncoder of filteredGpuEncoders) {
       // eslint-disable-next-line no-await-in-loop
@@ -247,6 +283,8 @@ export const getEncoder = async ({
 
     const enabledDevices = gpuEncoders.filter((device) => device.enabled === true);
 
+    args.jobLog(JSON.stringify({ enabledDevices }));
+
     if (enabledDevices.length > 0) {
       if (enabledDevices[0].encoder.includes('nvenc')) {
         const res = getBestNvencDevice({
@@ -257,6 +295,7 @@ export const getEncoder = async ({
         return {
           ...res,
           isGpu: true,
+          enabledDevices,
         };
       }
       return {
@@ -264,6 +303,7 @@ export const getEncoder = async ({
         inputArgs: enabledDevices[0].inputArgs,
         outputArgs: enabledDevices[0].outputArgs,
         isGpu: true,
+        enabledDevices,
       };
     }
   }
@@ -274,6 +314,7 @@ export const getEncoder = async ({
       inputArgs: [],
       outputArgs: [],
       isGpu: false,
+      enabledDevices: [],
     };
   } if (targetCodec === 'h264') {
     return {
@@ -281,6 +322,15 @@ export const getEncoder = async ({
       inputArgs: [],
       outputArgs: [],
       isGpu: false,
+      enabledDevices: [],
+    };
+  } if (targetCodec === 'av1') {
+    return {
+      encoder: 'libsvtav1',
+      inputArgs: [],
+      outputArgs: [],
+      isGpu: false,
+      enabledDevices: [],
     };
   }
 
@@ -289,5 +339,6 @@ export const getEncoder = async ({
     inputArgs: [],
     outputArgs: [],
     isGpu: false,
+    enabledDevices: [],
   };
 };

FlowPluginsTs/FlowHelpers/1.0.0/interfaces/interfaces.ts

@@ -77,7 +77,8 @@ export interface IffmpegCommand {
 }
 
 export interface Ivariables {
-    ffmpegCommand: IffmpegCommand
+    ffmpegCommand: IffmpegCommand,
+    flowFailed: boolean,
 }
 
 export interface IpluginOutputArgs {
@@ -133,8 +134,11 @@ export interface IpluginInputArgs {
         mvdir: any,
          // eslint-disable-next-line @typescript-eslint/no-explicit-any
         axios: any,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        crudTransDBN: (collection: string, mode: string, docID: string, obj: any)=> any,
     },
-    installClassicPluginDeps: (deps: string[]) => void,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    installClassicPluginDeps: (deps: string[]) => Promise<any>,
 }
 
 export interface IflowTemplate {