From efb4394c7b927b9b5327d4dfb46cb4ab632f249e Mon Sep 17 00:00:00 2001 From: mertalev <101130780+mertalev@users.noreply.github.com> Date: Fri, 22 Nov 2024 01:51:28 -0500 Subject: [PATCH] formatting --- server/src/services/media.service.spec.ts | 4 +--- server/src/utils/media.ts | 10 ++++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/src/services/media.service.spec.ts b/server/src/services/media.service.spec.ts index c2039e7ce6..7aef8e9ec8 100644 --- a/server/src/services/media.service.spec.ts +++ b/server/src/services/media.service.spec.ts @@ -2227,9 +2227,7 @@ describe(MediaService.name, () => { expect.objectContaining({ inputOptions: expect.arrayContaining(['-hwaccel rkmpp', '-hwaccel_output_format drm_prime', '-afbc rga']), outputOptions: expect.arrayContaining([ - expect.stringContaining( - 'scale_rkrga=-2:720:format=nv12:afbc=1:async_depth=4', - ), + expect.stringContaining('scale_rkrga=-2:720:format=nv12:afbc=1:async_depth=4'), ]), twoPass: false, }), diff --git a/server/src/utils/media.ts b/server/src/utils/media.ts index a979b84025..06b2b36411 100644 --- a/server/src/utils/media.ts +++ b/server/src/utils/media.ts @@ -59,8 +59,8 @@ export class BaseConfig implements VideoCodecSWConfig { } case TranscodeHWAccel.RKMPP: { handler = config.accelDecode - ? new RkmppHwDecodeConfig(config, devices, hasMaliOpenCL) - : new RkmppSwDecodeConfig(config, devices); + ? new RkmppHwDecodeConfig(config, devices, hasMaliOpenCL) + : new RkmppSwDecodeConfig(config, devices); break; } default: { @@ -989,7 +989,8 @@ export class RkmppHwDecodeConfig extends RkmppSwDecodeConfig { if (this.shouldToneMap(videoStream)) { const { primaries, transfer, matrix } = this.getColors(); if (this.hasMaliOpenCL) { - return [ // use RKMPP for scaling, OpenCL for tone mapping + return [ + // use RKMPP for scaling, OpenCL for tone mapping `scale_rkrga=${this.getScaling(videoStream)}:format=p010:afbc=1:async_depth=4`, 'hwmap=derive_device=opencl:mode=read', `tonemap_opencl=format=nv12:r=pc:p=${primaries}:t=${transfer}:m=${matrix}:tonemap=${this.config.tonemap}:desat=0:tonemap_mode=lum:peak=100`, @@ -997,7 +998,8 @@ export class RkmppHwDecodeConfig extends RkmppSwDecodeConfig { 'format=drm_prime', ]; } - return [ // use RKMPP for scaling, CPU for tone mapping (only works on RK3588 which support 10bit output) + return [ + // use RKMPP for scaling, CPU for tone mapping (only works on RK3588, which supports 10-bit output) `scale_rkrga=${this.getScaling(videoStream)}:format=p010:afbc=1:async_depth=4`, 'hwdownload', 'format=p010',