feat(server): use tonemapx for software tone-mapping (immich-app#13785)

TimVanOnckelen · Nov 5, 2024 · 2240a70 · 2240a70
1 parent 2802864
commit 2240a70
Show file tree

Hide file tree

Showing 16 changed files with 182 additions and 163 deletions.
diff --git a/docs/docs/install/config-file.md b/docs/docs/install/config-file.md
@@ -26,7 +26,6 @@ The default configuration looks like this:
     "bframes": -1,
     "refs": 0,
     "gopSize": 0,
-    "npl": 0,
     "temporalAQ": false,
     "cqMode": "auto",
     "twoPass": false,

diff --git a/i18n/en.json b/i18n/en.json
@@ -314,8 +314,6 @@
     "transcoding_threads_description": "Higher values lead to faster encoding, but leave less room for the server to process other tasks while active. This value should not be more than the number of CPU cores. Maximizes utilization if set to 0.",
     "transcoding_tone_mapping": "Tone-mapping",
     "transcoding_tone_mapping_description": "Attempts to preserve the appearance of HDR videos when converted to SDR. Each algorithm makes different tradeoffs for color, detail and brightness. Hable preserves detail, Mobius preserves color, and Reinhard preserves brightness.",
-    "transcoding_tone_mapping_npl": "Tone-mapping NPL",
-    "transcoding_tone_mapping_npl_description": "Colors will be adjusted to look normal for a display of this brightness. Counter-intuitively, lower values increase the brightness of the video and vice versa since it compensates for the brightness of the display. 0 sets this value automatically.",
     "transcoding_transcode_policy": "Transcode policy",
     "transcoding_transcode_policy_description": "Policy for when a video should be transcoded. HDR videos will always be transcoded (except if transcoding is disabled).",
     "transcoding_two_pass_encoding": "Two-pass encoding",

diff --git a/mobile/openapi/lib/model/system_config_f_fmpeg_dto.dart b/mobile/openapi/lib/model/system_config_f_fmpeg_dto.dart
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
@@ -11625,10 +11625,6 @@
           "maxBitrate": {
             "type": "string"
           },
-          "npl": {
-            "minimum": 0,
-            "type": "integer"
-          },
           "preferredHwDevice": {
             "type": "string"
           },
@@ -11677,7 +11673,6 @@
           "crf",
           "gopSize",
           "maxBitrate",
-          "npl",
           "preferredHwDevice",
           "preset",
           "refs",

diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1104,7 +1104,6 @@ export type SystemConfigFFmpegDto = {
     crf: number;
     gopSize: number;
     maxBitrate: string;
-    npl: number;
     preferredHwDevice: string;
     preset: string;
     refs: number;

diff --git a/server/src/config.ts b/server/src/config.ts
@@ -41,7 +41,6 @@ export interface SystemConfig {
     bframes: number;
     refs: number;
     gopSize: number;
-    npl: number;
     temporalAQ: boolean;
     cqMode: CQMode;
     twoPass: boolean;
@@ -190,7 +189,6 @@ export const defaults = Object.freeze<SystemConfig>({
     bframes: -1,
     refs: 0,
     gopSize: 0,
-    npl: 0,
     temporalAQ: false,
     cqMode: CQMode.AUTO,
     twoPass: false,

diff --git a/server/src/dtos/system-config.dto.ts b/server/src/dtos/system-config.dto.ts
@@ -134,12 +134,6 @@ export class SystemConfigFFmpegDto {
   @ApiProperty({ type: 'integer' })
   gopSize!: number;
 
-  @IsInt()
-  @Min(0)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  npl!: number;
-
   @ValidateBoolean()
   temporalAQ!: boolean;
 

diff --git a/server/src/interfaces/media.interface.ts b/server/src/interfaces/media.interface.ts
@@ -59,6 +59,7 @@ export interface VideoStreamInfo {
   frameCount: number;
   isHDR: boolean;
   bitrate: number;
+  pixelFormat: string;
 }
 
 export interface AudioStreamInfo {

diff --git a/server/src/migrations/1730227312171-RemoveNplFromSystemConfig.ts b/server/src/migrations/1730227312171-RemoveNplFromSystemConfig.ts
@@ -0,0 +1,12 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveNplFromSystemConfig1730227312171 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+        update system_metadata
+        set value = value #- '{ffmpeg,npl}'
+        where key = 'system-config' and value->'ffmpeg'->'npl' is not null`);
+  }
+
+  public async down(): Promise<void> {}
+}
diff --git a/server/src/repositories/media.repository.ts b/server/src/repositories/media.repository.ts
@@ -126,6 +126,7 @@ export class MediaRepository implements IMediaRepository {
           rotation: this.parseInt(stream.rotation),
           isHDR: stream.color_transfer === 'smpte2084' || stream.color_transfer === 'arib-std-b67',
           bitrate: this.parseInt(stream.bit_rate),
+          pixelFormat: stream.pix_fmt || 'yuv420p',
         })),
       audioStreams: results.streams
         .filter((stream) => stream.codec_type === 'audio')