diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2020-09-04 10:06:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 10:06:15 -0400 |
| commit | 559a7fc336a022c92f63a8d77b6eb3c2f915c290 (patch) | |
| tree | ad94c00c469516594a0738f2b3e18af615742f5d /MediaBrowser.MediaEncoding | |
| parent | 945be64ad6dc97e1668b2656b1acc46699ca08e3 (diff) | |
| parent | 4cb0a57e4645aba8e5e65c7d086091b9161c6c09 (diff) | |
Merge pull request #3442 from nyanmisaka/tonemap
Tonemapping function relying on OpenCL filter and NVENC HEVC decoder
Diffstat (limited to 'MediaBrowser.MediaEncoding')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs | 10 |
2 files changed, 24 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs b/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs index b7b23deff..8a7c032c5 100644 --- a/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs +++ b/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs @@ -283,6 +283,20 @@ namespace MediaBrowser.MediaEncoding.Probing public IReadOnlyDictionary<string, int> Disposition { get; set; } /// <summary> + /// Gets or sets the color range. + /// </summary> + /// <value>The color range.</value> + [JsonPropertyName("color_range")] + public string ColorRange { get; set; } + + /// <summary> + /// Gets or sets the color space. + /// </summary> + /// <value>The color space.</value> + [JsonPropertyName("color_space")] + public string ColorSpace { get; set; } + + /// <summary> /// Gets or sets the color transfer. /// </summary> /// <value>The color transfer.</value> diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs index 40a3b43e1..22537a4d9 100644 --- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs +++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs @@ -714,6 +714,16 @@ namespace MediaBrowser.MediaEncoding.Probing stream.RefFrames = streamInfo.Refs; } + if (!string.IsNullOrEmpty(streamInfo.ColorRange)) + { + stream.ColorRange = streamInfo.ColorRange; + } + + if (!string.IsNullOrEmpty(streamInfo.ColorSpace)) + { + stream.ColorSpace = streamInfo.ColorSpace; + } + if (!string.IsNullOrEmpty(streamInfo.ColorTransfer)) { stream.ColorTransfer = streamInfo.ColorTransfer; |