High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(server): override reserved color metadata for video thumbnails (#22348)
Mert24234bedf14c
diff --git a/server/src/repositories/media.repository.ts b/server/src/repositories/media.repository.tsindex fa36c41798..d98e018efb 100644--- a/server/src/repositories/media.repository.ts+++ b/server/src/repositories/media.repository.ts@@ -203,6 +203,9 @@ export class MediaRepository {isHDR: stream.color_transfer === 'smpte2084' || stream.color_transfer === 'arib-std-b67',bitrate: this.parseInt(stream.bit_rate),pixelFormat: stream.pix_fmt || 'yuv420p',+ colorPrimaries: stream.color_primaries,+ colorSpace: stream.color_space,+ colorTransfer: stream.color_transfer,})),audioStreams: results.streams.filter((stream) => stream.codec_type === 'audio')diff --git a/server/src/services/media.service.spec.ts b/server/src/services/media.service.spec.tsindex e494dd9bcc..08606731a0 100644--- a/server/src/services/media.service.spec.ts+++ b/server/src/services/media.service.spec.ts@@ -445,6 +445,7 @@ describe(MediaService.name, () => {}),);});+it('should not skip intra frames for MTS file', async () => {mocks.media.probe.mockResolvedValue(probeStub.videoStreamMTS);mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.video);@@ -462,6 +463,25 @@ describe(MediaService.name, () => {);});+ it('should override reserved color metadata', async () => {+ mocks.media.probe.mockResolvedValue(probeStub.videoStreamReserved);+ mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.video);+ await sut.handleGenerateThumbnails({ id: assetStub.video.id });++ expect(mocks.media.transcode).toHaveBeenCalledWith(+ '/original/path.ext',+ expect.any(String),+ expect.objectContaining({+ inputOptions: expect.arrayContaining([+ '-bsf:v hevc_metadata=colour_primaries=1:matrix_coefficients=1:transfer_characteristics=1',+ ]),+ outputOptions: expect.any(Array),+ progress: expect.any(Object),+ twoPass: false,+ }),+ );+ });+it('should use scaling divisible by 2 even when using quick sync', async () => {mocks.media.probe.mockResolvedValue(probeStub.videoStream2160p);mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv } });diff --git a/server/src/types.ts b/server/src/types.tsindex ce0baa1672..da3889ef7c 100644--- a/server/src/types.ts+++ b/server/src/types.ts@@ -88,6 +88,9 @@ export interface VideoStreamInfo {isHDR: boolean;bitrate: number;pixelFormat: string;+ colorPrimaries?: string;+ colorSpace?: string;+ colorTransfer?: string;}export interface AudioStreamInfo {diff --git a/server/src/utils/media.ts b/server/src/utils/media.tsindex 1ecd005315..f678a32b0f 100644--- a/server/src/utils/media.ts+++ b/server/src/utils/media.ts@@ -392,9 +392,30 @@ export class ThumbnailConfig extends BaseConfig {getBaseInputOptions(videoStream: VideoStreamInfo, format?: VideoFormat): string[] {// skip_frame nointra skips all frames for some MPEG-TS files. Look at ffmpeg tickets 7950 and 7895 for more details.- return format?.formatName === 'mpegts'- ? ['-sws_flags accurate_rnd+full_chroma_int']- : ['-skip_frame nointra', '-sws_flags accurate_rnd+full_chroma_int'];+ const options =+ format?.formatName === 'mpegts'+ ? ['-sws_flags accurate_rnd+full_chroma_int']+ : ['-skip_frame nointra', '-sws_flags accurate_rnd+full_chroma_int'];++ const metadataOverrides = [];+ if (videoStream.colorPrimaries === 'reserved') {+ metadataOverrides.push('colour_primaries=1');+ }++ if (videoStream.colorSpace === 'reserved') {+ metadataOverrides.push('matrix_coefficients=1');+ }++ if (videoStream.colorTransfer === 'reserved') {+ metadataOverrides.push('transfer_characteristics=1');+ }++ if (metadataOverrides.length > 0) {+ // workaround for https://fftrac-bg.ffmpeg.org/ticket/11020+ options.push(`-bsf:v ${videoStream.codecName}_metadata=${metadataOverrides.join(':')}`);+ }++ return options;}getBaseOutputOptions() {diff --git a/server/test/fixtures/media.stub.ts b/server/test/fixtures/media.stub.tsindex efbf21d317..727f5ae7cf 100644--- a/server/test/fixtures/media.stub.ts+++ b/server/test/fixtures/media.stub.ts@@ -261,4 +261,15 @@ export const probeStub = {bitrate: 0,},}),+ videoStreamReserved: Object.freeze<VideoInfo>({+ ...probeStubDefault,+ videoStreams: [+ {+ ...probeStubDefaultVideoStream[0],+ colorPrimaries: 'reserved',+ colorSpace: 'reserved',+ colorTransfer: 'reserved',+ },+ ],+ }),};