From 082c0984208db76a383875958e96e542ea5c581a Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 11 Jul 2019 17:51:48 -0700 Subject: [PATCH] New: Include HDR is naming examples Closes #3199 --- .../MediaFiles/MediaInfo/MediaInfoFormatter.cs | 4 ++-- src/NzbDrone.Core/Organizer/FileNameSampleService.cs | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs index bbe839bef..99f4dd2bb 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs @@ -480,8 +480,8 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo var videoDynamicRange = ""; if (mediaInfo.VideoBitDepth >= 10 && - !string.IsNullOrEmpty(mediaInfo.VideoColourPrimaries) && - !string.IsNullOrEmpty(mediaInfo.VideoTransferCharacteristics)) + mediaInfo.VideoColourPrimaries.IsNotNullOrWhiteSpace() && + mediaInfo.VideoTransferCharacteristics.IsNotNullOrWhiteSpace()) { if (mediaInfo.VideoColourPrimaries.EqualsIgnoreCase(ValidHdrColourPrimaries) && ValidHdrTransferFunctions.Any(mediaInfo.VideoTransferCharacteristics.Contains)) diff --git a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs index 9f1909a76..79ec0e951 100644 --- a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs +++ b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs @@ -101,7 +101,9 @@ namespace NzbDrone.Core.Organizer var mediaInfo = new MediaInfoModel() { VideoCodec = "AVC", - VideoBitDepth = 8, + VideoBitDepth = 10, + VideoColourPrimaries = "BT.2020", + VideoTransferCharacteristics = "HLG", AudioFormat = "DTS", AudioChannels = 6, AudioChannelPositions = "3/2/0.1", @@ -112,7 +114,9 @@ namespace NzbDrone.Core.Organizer var mediaInfoAnime = new MediaInfoModel() { VideoCodec = "AVC", - VideoBitDepth = 8, + VideoBitDepth = 10, + VideoColourPrimaries = "BT.2020", + VideoTransferCharacteristics = "HLG", AudioFormat = "DTS", AudioChannels = 6, AudioChannelPositions = "3/2/0.1",