tbelway/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-11-04 03:39:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): nvenc not working when there are no filters (#9802)

Browse Source 
don't add format=nv12
This commit is contained in:
Mert 2024-05-27 15:18:01 -04:00 committed by GitHub
parent 351dd647a9
commit 21bd20fd75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/utils/media.ts
View File

@ -538,8 +538,6 @@ export class NvencHwDecodeConfig extends NvencSwDecodeConfig {
options.push(...this.getToneMapping(videoStream)); options.push(...this.getToneMapping(videoStream));
if (options.length > 0) { if (options.length > 0) {
options[options.length - 1] += ':format=nv12'; options[options.length - 1] += ':format=nv12';
} else {
options.push('format=nv12');
} }
return options; return options;
} }
@ -563,7 +561,7 @@ export class NvencHwDecodeConfig extends NvencSwDecodeConfig {
} }
getInputThreadOptions() { getInputThreadOptions() {
return [`-threads ${this.config.threads <= 0 ? 1 : this.config.threads}`]; return [`-threads 1`];
} }
getOutputThreadOptions() { getOutputThreadOptions() {
@ -653,7 +651,7 @@ export class QsvHwDecodeConfig extends QsvSwDecodeConfig {
throw new Error('No QSV device found'); throw new Error('No QSV device found');
} }
const options = ['-hwaccel qsv', '-hwaccel_output_format qsv', '-async_depth 4', '-threads 1']; const options = ['-hwaccel qsv', '-hwaccel_output_format qsv', '-async_depth 4', ...this.getInputThreadOptions()];
const hwDevice = this.getPreferredHardwareDevice(); const hwDevice = this.getPreferredHardwareDevice();
if (hwDevice) { if (hwDevice) {
options.push(`-qsv_device ${hwDevice}`); options.push(`-qsv_device ${hwDevice}`);
@ -698,6 +696,10 @@ export class QsvHwDecodeConfig extends QsvSwDecodeConfig {
'hwmap=derive_device=qsv:reverse=1,format=qsv', 'hwmap=derive_device=qsv:reverse=1,format=qsv',
]; ];
} }
getInputThreadOptions() {
return [`-threads 1`];
}
} }
export class VAAPIConfig extends BaseHWConfig { export class VAAPIConfig extends BaseHWConfig {