Add hardwareType option

This commit is contained in:
HaveAGitGat 2023-10-02 07:52:51 +01:00
parent 4aa7f0cee1
commit c7349c1c28
8 changed files with 81 additions and 16 deletions

View file

@ -111,6 +111,22 @@ var details = function () { return ({
},
tooltip: 'Specify whether to use hardware encoding if available',
},
{
name: 'hardwareType',
type: 'string',
defaultValue: 'auto',
inputUI: {
type: 'dropdown',
options: [
'auto',
'nvenc',
'qsv',
'vaapi',
'videotoolbox',
],
},
tooltip: 'Specify codec of the output file',
},
{
name: 'hardwareDecoding',
type: 'boolean',
@ -148,7 +164,7 @@ var details = function () { return ({
exports.details = details;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function () {
var lib, hardwareDecoding, i, stream, targetCodec, ffmpegPreset, ffmpegQuality, forceEncoding, hardwarEncoding, encoderProperties;
var lib, hardwareDecoding, hardwareType, i, stream, targetCodec, ffmpegPreset, ffmpegQuality, forceEncoding, hardwarEncoding, encoderProperties;
var _a, _b;
return __generator(this, function (_c) {
switch (_c.label) {
@ -157,6 +173,7 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
args.inputs = lib.loadDefaultValues(args.inputs, details);
hardwareDecoding = args.inputs.hardwareDecoding === true;
hardwareType = String(args.inputs.hardwareType);
args.variables.ffmpegCommand.hardwareDecoding = hardwareDecoding;
i = 0;
_c.label = 1;
@ -175,6 +192,7 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
return [4 /*yield*/, (0, hardwareUtils_1.getEncoder)({
targetCodec: targetCodec,
hardwareEncoding: hardwarEncoding,
hardwareType: hardwareType,
args: args,
})];
case 2:

View file

@ -94,6 +94,7 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
return [4 /*yield*/, (0, hardwareUtils_1.getEncoder)({
targetCodec: 'hevc',
hardwareEncoding: true,
hardwareType: 'auto',
args: args,
})];
case 1:

View file

@ -160,9 +160,9 @@ var encoderFilter = function (encoder, targetCodec) {
return false;
};
var getEncoder = function (_a) {
var targetCodec = _a.targetCodec, hardwareEncoding = _a.hardwareEncoding, args = _a.args;
var targetCodec = _a.targetCodec, hardwareEncoding = _a.hardwareEncoding, hardwareType = _a.hardwareType, args = _a.args;
return __awaiter(void 0, void 0, void 0, function () {
var gpuEncoders, filteredGpuEncoders, _i, filteredGpuEncoders_1, gpuEncoder, _b, enabledDevices, res;
var gpuEncoders, filteredGpuEncoders, idx, _i, filteredGpuEncoders_1, gpuEncoder, _b, enabledDevices, res;
return __generator(this, function (_c) {
switch (_c.label) {
case 0:
@ -290,6 +290,13 @@ var getEncoder = function (_a) {
},
];
filteredGpuEncoders = gpuEncoders.filter(function (device) { return encoderFilter(device.encoder, targetCodec); });
if (hardwareEncoding && hardwareType !== 'auto') {
idx = filteredGpuEncoders.findIndex(function (device) { return device.encoder.includes(hardwareType); });
if (idx === -1) {
throw new Error("Could not find encoder ".concat(targetCodec, " for hardware ").concat(hardwareType));
}
return [2 /*return*/, __assign(__assign({}, filteredGpuEncoders[idx]), { isGpu: true, enabledDevices: [] })];
}
args.jobLog(JSON.stringify({ filteredGpuEncoders: filteredGpuEncoders }));
_i = 0, filteredGpuEncoders_1 = filteredGpuEncoders;
_c.label = 1;
@ -312,7 +319,7 @@ var getEncoder = function (_a) {
_i++;
return [3 /*break*/, 1];
case 4:
enabledDevices = gpuEncoders.filter(function (device) { return device.enabled === true; });
enabledDevices = filteredGpuEncoders.filter(function (device) { return device.enabled === true; });
args.jobLog(JSON.stringify({ enabledDevices: enabledDevices }));
if (enabledDevices.length > 0) {
if (enabledDevices[0].encoder.includes('nvenc')) {

View file

@ -44,6 +44,7 @@ var run = function () { return __awaiter(void 0, void 0, void 0, function () {
case 0: return [4 /*yield*/, (0, hardwareUtils_1.getEncoder)({
targetCodec: 'h264',
hardwareEncoding: true,
hardwareType: 'auto',
// @ts-expect-error type
args: {
workerType: 'transcodegpu',