feat(server): tone-mapping (#3512)

* added tonemapping

* check for hdr in transcode policy

* merged video thumbnail and transcoding logic

* updated tests

* removed log

* added dashboard option, updated api

* `out_color_matrix` for sdr video thumbs, cleanup

* updated tests & styling

* refactored tonemapping setting

* fixed tests

* formatting

* added tests

* updated api

* set target npl higher for mobius and reinhard

* convert to nv12 before nvenc

* fix test

---------

Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
This commit is contained in:
Mert 2023-08-07 16:35:25 -04:00 committed by GitHub
parent 19da705fcb
commit 1d37d8cac0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 549 additions and 89 deletions

View file

@ -21,6 +21,7 @@ class SystemConfigFFmpegDto {
required this.targetResolution,
required this.targetVideoCodec,
required this.threads,
required this.tonemap,
required this.transcode,
required this.twoPass,
});
@ -41,6 +42,8 @@ class SystemConfigFFmpegDto {
int threads;
ToneMapping tonemap;
TranscodePolicy transcode;
bool twoPass;
@ -55,6 +58,7 @@ class SystemConfigFFmpegDto {
other.targetResolution == targetResolution &&
other.targetVideoCodec == targetVideoCodec &&
other.threads == threads &&
other.tonemap == tonemap &&
other.transcode == transcode &&
other.twoPass == twoPass;
@ -69,11 +73,12 @@ class SystemConfigFFmpegDto {
(targetResolution.hashCode) +
(targetVideoCodec.hashCode) +
(threads.hashCode) +
(tonemap.hashCode) +
(transcode.hashCode) +
(twoPass.hashCode);
@override
String toString() => 'SystemConfigFFmpegDto[accel=$accel, crf=$crf, maxBitrate=$maxBitrate, preset=$preset, targetAudioCodec=$targetAudioCodec, targetResolution=$targetResolution, targetVideoCodec=$targetVideoCodec, threads=$threads, transcode=$transcode, twoPass=$twoPass]';
String toString() => 'SystemConfigFFmpegDto[accel=$accel, crf=$crf, maxBitrate=$maxBitrate, preset=$preset, targetAudioCodec=$targetAudioCodec, targetResolution=$targetResolution, targetVideoCodec=$targetVideoCodec, threads=$threads, tonemap=$tonemap, transcode=$transcode, twoPass=$twoPass]';
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
@ -85,6 +90,7 @@ class SystemConfigFFmpegDto {
json[r'targetResolution'] = this.targetResolution;
json[r'targetVideoCodec'] = this.targetVideoCodec;
json[r'threads'] = this.threads;
json[r'tonemap'] = this.tonemap;
json[r'transcode'] = this.transcode;
json[r'twoPass'] = this.twoPass;
return json;
@ -106,6 +112,7 @@ class SystemConfigFFmpegDto {
targetResolution: mapValueOfType<String>(json, r'targetResolution')!,
targetVideoCodec: VideoCodec.fromJson(json[r'targetVideoCodec'])!,
threads: mapValueOfType<int>(json, r'threads')!,
tonemap: ToneMapping.fromJson(json[r'tonemap'])!,
transcode: TranscodePolicy.fromJson(json[r'transcode'])!,
twoPass: mapValueOfType<bool>(json, r'twoPass')!,
);
@ -163,6 +170,7 @@ class SystemConfigFFmpegDto {
'targetResolution',
'targetVideoCodec',
'threads',
'tonemap',
'transcode',
'twoPass',
};

View file

@ -0,0 +1,91 @@
//
// AUTO-GENERATED FILE, DO NOT MODIFY!
//
// @dart=2.12
// ignore_for_file: unused_element, unused_import
// ignore_for_file: always_put_required_named_parameters_first
// ignore_for_file: constant_identifier_names
// ignore_for_file: lines_longer_than_80_chars
part of openapi.api;
class ToneMapping {
/// Instantiate a new enum with the provided [value].
const ToneMapping._(this.value);
/// The underlying value of this enum member.
final String value;
@override
String toString() => value;
String toJson() => value;
static const hable = ToneMapping._(r'hable');
static const mobius = ToneMapping._(r'mobius');
static const reinhard = ToneMapping._(r'reinhard');
static const disabled = ToneMapping._(r'disabled');
/// List of all possible values in this [enum][ToneMapping].
static const values = <ToneMapping>[
hable,
mobius,
reinhard,
disabled,
];
static ToneMapping? fromJson(dynamic value) => ToneMappingTypeTransformer().decode(value);
static List<ToneMapping>? listFromJson(dynamic json, {bool growable = false,}) {
final result = <ToneMapping>[];
if (json is List && json.isNotEmpty) {
for (final row in json) {
final value = ToneMapping.fromJson(row);
if (value != null) {
result.add(value);
}
}
}
return result.toList(growable: growable);
}
}
/// Transformation class that can [encode] an instance of [ToneMapping] to String,
/// and [decode] dynamic data back to [ToneMapping].
class ToneMappingTypeTransformer {
factory ToneMappingTypeTransformer() => _instance ??= const ToneMappingTypeTransformer._();
const ToneMappingTypeTransformer._();
String encode(ToneMapping data) => data.value;
/// Decodes a [dynamic value][data] to a ToneMapping.
///
/// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
/// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
/// cannot be decoded successfully, then an [UnimplementedError] is thrown.
///
/// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
/// and users are still using an old app with the old code.
ToneMapping? decode(dynamic data, {bool allowNull = true}) {
if (data != null) {
switch (data) {
case r'hable': return ToneMapping.hable;
case r'mobius': return ToneMapping.mobius;
case r'reinhard': return ToneMapping.reinhard;
case r'disabled': return ToneMapping.disabled;
default:
if (!allowNull) {
throw ArgumentError('Unknown enum value to decode: $data');
}
}
}
return null;
}
/// Singleton [ToneMappingTypeTransformer] instance.
static ToneMappingTypeTransformer? _instance;
}