Skip to content

Commit 61407c9

Browse files
committed
Revert "fix(server): incorrect out_color_matrix value when generating thumbnails (#13409)"
This reverts commit 9bdfb41.
1 parent f59b813 commit 61407c9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

server/src/services/media.service.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ describe(MediaService.name, () => {
410410
'-frames:v 1',
411411
'-update 1',
412412
'-v verbose',
413-
String.raw`-vf fps=12:eof_action=pass:round=down,thumbnail=12,select=gt(scene\,0.1)-eq(prev_selected_n\,n)+isnan(prev_selected_n)+gt(n\,20),trim=end_frame=2,reverse,scale=-2:1440:flags=lanczos+accurate_rnd+full_chroma_int:out_color_matrix=bt601:out_range=pc,format=yuv420p`,
413+
String.raw`-vf fps=12:eof_action=pass:round=down,thumbnail=12,select=gt(scene\,0.1)-eq(prev_selected_n\,n)+isnan(prev_selected_n)+gt(n\,20),trim=end_frame=2,reverse,scale=-2:1440:flags=lanczos+accurate_rnd+full_chroma_int:out_color_matrix=601:out_range=pc,format=yuv420p`,
414414
],
415415
twoPass: false,
416416
}),
@@ -445,7 +445,7 @@ describe(MediaService.name, () => {
445445
'-frames:v 1',
446446
'-update 1',
447447
'-v verbose',
448-
String.raw`-vf fps=12:eof_action=pass:round=down,thumbnail=12,select=gt(scene\,0.1)-eq(prev_selected_n\,n)+isnan(prev_selected_n)+gt(n\,20),trim=end_frame=2,reverse,zscale=t=linear:npl=100,tonemap=hable:desat=0,zscale=p=bt709:t=bt601:m=bt470bg:range=pc,format=yuv420p`,
448+
String.raw`-vf fps=12:eof_action=pass:round=down,thumbnail=12,select=gt(scene\,0.1)-eq(prev_selected_n\,n)+isnan(prev_selected_n)+gt(n\,20),trim=end_frame=2,reverse,zscale=t=linear:npl=100,tonemap=hable:desat=0,zscale=p=bt709:t=601:m=bt470bg:range=pc,format=yuv420p`,
449449
],
450450
twoPass: false,
451451
}),
@@ -482,7 +482,7 @@ describe(MediaService.name, () => {
482482
'-frames:v 1',
483483
'-update 1',
484484
'-v verbose',
485-
String.raw`-vf fps=12:eof_action=pass:round=down,thumbnail=12,select=gt(scene\,0.1)-eq(prev_selected_n\,n)+isnan(prev_selected_n)+gt(n\,20),trim=end_frame=2,reverse,zscale=t=linear:npl=100,tonemap=hable:desat=0,zscale=p=bt709:t=bt601:m=bt470bg:range=pc,format=yuv420p`,
485+
String.raw`-vf fps=12:eof_action=pass:round=down,thumbnail=12,select=gt(scene\,0.1)-eq(prev_selected_n\,n)+isnan(prev_selected_n)+gt(n\,20),trim=end_frame=2,reverse,zscale=t=linear:npl=100,tonemap=hable:desat=0,zscale=p=bt709:t=601:m=bt470bg:range=pc,format=yuv420p`,
486486
],
487487
twoPass: false,
488488
}),

server/src/utils/media.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -424,15 +424,15 @@ export class ThumbnailConfig extends BaseConfig {
424424
getScaling(videoStream: VideoStreamInfo) {
425425
let options = super.getScaling(videoStream) + ':flags=lanczos+accurate_rnd+full_chroma_int';
426426
if (!this.shouldToneMap(videoStream)) {
427-
options += ':out_color_matrix=bt601:out_range=pc';
427+
options += ':out_color_matrix=601:out_range=pc';
428428
}
429429
return options;
430430
}
431431

432432
getColors() {
433433
return {
434434
primaries: 'bt709',
435-
transfer: 'bt601',
435+
transfer: '601',
436436
matrix: 'bt470bg',
437437
};
438438
}

0 commit comments

Comments
 (0)